Merge remote-tracking branch 'origin/develop' into develop

pengcheng
2 parents 526a66a9 aee78088
Showing 4 changed files with 22 additions and 14 deletions
src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
src/main/java/com/huaheng/pc/shipment/shipmentContainerDetail/domain/ShipmentContainerDetail.java
src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
src/main/java/com/huaheng/pc/task/taskHeader/service/ShipmentTaskService.java
@@ -330,35 +330,33 @@ public class RyTask extends BaseController {
                 .eq(ShipmentHeader::getShipmentType, "SCLLD")
                 .lt(ShipmentHeader::getMesErrorCount, 3)
                 .ne(ShipmentHeader::getMesSuccessStatus, 1)
-                .gt(ShipmentHeader::getLastStatus, 500)
-                .gt(ShipmentHeader::getFirstStatus, 500));
+                .gt(ShipmentHeader::getLastStatus, 499)
+                .gt(ShipmentHeader::getFirstStatus, 499));
         for (ShipmentHeader shipmentHeader:shipmentHeaderList){
             //出库详情
-            List<ShipmentContainerDetail> shipmentDetailList = shipmentContainerDetailService.list(new LambdaQueryWrapper<ShipmentContainerDetail>()
-                    .eq(ShipmentContainerDetail::getShipmentId, shipmentHeader.getId()));
+            List<ShipmentContainerDetail> shipmentContainerDetailList = shipmentContainerDetailService.list(new LambdaQueryWrapper<ShipmentContainerDetail>()
+                    .eq(ShipmentContainerDetail::getShipmentId, shipmentHeader.getId())
+                    .gt(ShipmentContainerDetail::getMaterialGrossWeight,0));
-            orderData.setBatterynumber(new BigDecimal(shipmentDetailList.size()));//电池包只会出一个
+            orderData.setBatterynumber(new BigDecimal(shipmentContainerDetailList.size()));//电池包只会出一个
             header.setMethod("ServicesCUS.Module_CUS.CUS_AcceptWMSBatterybarcode");
             header.setAccount("DS");header.setPassword("DS");header.setVersion("");header.setModules(new String[]{});
             header.setMac("");header.setLang("zh_CN");header.setIs_debug(true);header.setPlatform("web");header.setSession("");
             List<Barcodedata> barcodedataList = new ArrayList<>();
-            for (int i = 0; i < shipmentDetailList.size(); i++) {
-                ShipmentContainerDetail shipmentContainerDetail=shipmentDetailList.get(i);
+            for (int i = 0; i < shipmentContainerDetailList.size(); i++) {
+                ShipmentContainerDetail shipmentContainerDetail=shipmentContainerDetailList.get(i);
+
                 ShipmentDetail shipmentDetail=shipmentDetailService.getById(shipmentContainerDetail.getShipmentDetailId());
                 if (StringUtils.isEmpty(shipmentDetail.getOrderNo())) {
                     throw new ServiceException("订单号为空");
                 }
                 orderData.setOrderNo(shipmentDetail.getOrderNo());
                 Barcodedata barcodedata = new Barcodedata();
-                barcodedata.setWeight(shipmentDetailList.get(i).getMaterialNetWeight());
-                if (StringUtils.isEmpty(shipmentDetailList.get(i).getBatteryPackTwoCode())) {
-                    throw new ServiceException("电池编码为空");
-                }
-                barcodedata.setBatterybarcode(shipmentDetailList.get(i).getBatteryPackTwoCode());
-                barcodedata.setElectricquantity(shipmentDetailList.get(i).getElectricQuantity());
-                barcodedata.setMaterialBatch(shipmentDetail.getMaterialBatch());
+                barcodedata.setBatterybarcode(shipmentContainerDetail.getBatteryPackTwoCode());
+                barcodedata.setElectricquantity(shipmentContainerDetail.getElectricQuantity());
+                barcodedata.setMaterialBatch(shipmentContainerDetail.getMaterialBatch());
                 barcodedataList.add(barcodedata);
                 orderData.setBarcodedata(barcodedataList);
             }
@@ -406,6 +406,14 @@ public class ShipmentContainerDetail implements Serializable {
     @ApiModelProperty(value="电池包二维码")
     private String batteryPackTwoCode;
+    /**
+     * 原料批次
+     * @return
+     */
+    @TableField(value = "materialBatch")
+    @ApiModelProperty(value="原料批次")
+    private String materialBatch;
+
     private static final long serialVersionUID = 1L;
 }
@@ -415,6 +415,7 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
         shipmentContainerDetaill.setMaterialTareWeight(inventoryDetail.getMaterialTareWeight());
         shipmentContainerDetaill.setMaterialNetWeight(inventoryDetail.getMaterialNetWeight());
         shipmentContainerDetaill.setMaterialGrossWeight(inventoryDetail.getMaterialGrossWeight());
+        shipmentContainerDetaill.setMaterialBatch(inventoryDetail.getMaterialBatch());
         shipmentContainerDetaill.setElectricQuantity(inventoryDetail.getElectricQuantity());
         shipmentContainerDetaill.setBatteryPackTwoCode(inventoryDetail.getBatteryPackTwoCode());
         shipmentContainerDetaill.setQty(qty);
@@ -411,6 +411,7 @@ public class ShipmentTaskService {
             if (StringUtils.isNotNull(shipmentDetail)) {
                 if (shipmentDetail.getShipQty().compareTo(shipmentDetail.getRequestQty()) == 0) {
                     shipmentDetail.setBatteryPackTwoCode(taskDetail.getBatteryPackTwoCode());
+                    shipmentDetail.setElectricQuantity(taskDetail.getElectricQuantity());
                     shipmentDetail.setMaterialBatch(taskDetail.getMaterialBatch());
                     shipmentDetail.setStatus(QuantityConstant.SHIPMENT_HEADER_COMPLETED);
                     shipmentDetailService.updateById(shipmentDetail);