Merge branch 'master' of http://123.57.213.14:3001/zgzt/dosb-java into master

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsendChangeShift/controller/BilletHotsendChangeShiftController.java

@@ -1513,7 +1513,10 @@ public class BilletHotsendChangeShiftController extends JeecgController<BilletHo
 				.eq(BilletLiftingBill::getVehicleNumber, vehicleNumber)
 				.eq(BilletLiftingBill::getLiftingType, liftingType)
 				.between(BilletLiftingBill::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
-
+		if ("2".equals(liftingType)){
+			// 堆垛只统计起垛的数据，下垛的数据不统计
+			queryWrapper.eq(BilletLiftingBill::getBelongType, "2");
+		}
 		List<BilletLiftingBill> billList = billetLiftingBillService.list(queryWrapper);
 		int amount;
 		double weight;

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetLiftingBill/entity/BilletLiftingBill.java

@@ -123,4 +123,9 @@ public class BilletLiftingBill implements Serializable {
     @Excel(name = "坯重", width = 15)
     @ApiModelProperty(value = "坯重",required = true)
     private Double billetWeight;
+
+    /**所属类型（0：热送，1：热装，2：起垛，3：下垛）*/
+    @Excel(name = "所属类型（0：热送，1：热装，2：起垛，3：下垛）", width = 15)
+    @ApiModelProperty(value = "所属类型（0：热送，1：热装，2：起垛，3：下垛）")
+    private String belongType;
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/service/impl/StorageBillServiceImpl.java

@@ -1532,6 +1532,11 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                 .eq(BilletLiftingBill::getShiftGroup, shiftGroup)
                 .eq(BilletLiftingBill::getVehicleNumber, vehicleNumber)
                 .eq(BilletLiftingBill::getLiftingType, liftingType);
+        if ("2".equals(liftingType)){
+            // 堆垛只统计起垛的数据，下垛的数据不统计
+            log.info("{}{}", "堆垛只统计起垛的数据，下垛的数据不统计！", new Date());
+            queryWrapper.eq(BilletLiftingBill::getBelongType, "2");
+        }
         if(oConvertUtils.isEmpty(changeShiftId)){
             queryWrapper.between(BilletLiftingBill::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
         }else {