fix: 修改出库回传字段数据

易文鹏
1 parent 347a5e31
Showing 3 changed files with 21 additions and 10 deletions
src/main/java/com/huaheng/api/mes/controller/MesReceiptController.java
src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
src/main/java/com/huaheng/pc/task/taskHeader/service/ShipmentTaskService.java
@@ -565,7 +565,9 @@ public class MesReceiptController extends BaseController {
  
         JSONArray jsonArray = new JSONArray();
         JSONObject Rd_In_S = new JSONObject();
-        List<TaskDetail> taskDetails = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>().eq(TaskDetail::getBillDetailId, receiptDetail.getId()));
+        List<TaskDetail> taskDetails = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>()
+                .eq(TaskDetail::getInternalTaskType, 100)
+                .eq(TaskDetail::getBillDetailId, receiptDetail.getId()));
         String str = computeWarehouseType(taskDetails);
         Rd_In_S.put("cidefine10", str);
         Rd_In_S.put("MGPK", receiptHeader.getMOMID());
@@ -621,7 +623,9 @@ public class MesReceiptController extends BaseController {
         List<OtherReceiptDetail> list = new ArrayList<>();
         for (ReceiptDetail receiptDetail : receiptDetails) {
             OtherReceiptDetail detail = new OtherReceiptDetail();
-            List<TaskDetail> taskDetails = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>().eq(TaskDetail::getBillDetailId, receiptDetail.getId()));
+            List<TaskDetail> taskDetails = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>()
+                    .eq(TaskDetail::getInternalTaskType, 100)
+                    .eq(TaskDetail::getBillDetailId, receiptDetail.getId()));
             String str = computeWarehouseType(taskDetails);
             detail.setIsFlat(str);
             detail.setMomIdByHeader(receiptHeader.getMOMID());
@@ -753,7 +757,6 @@ public class MesReceiptController extends BaseController {
         return true;
     }
  
-
     public JSONArray getRd_Out_S(ShipmentHeader shipmentHeader, List<ShipmentDetail> shipmentDetailList) {
         JSONArray jsonArray = new JSONArray();
         shipmentDetailList.forEach(shipmentDetail -> {
@@ -771,7 +774,9 @@ public class MesReceiptController extends BaseController {
             // MOM传入的入库数量
             Rd_Out_S.put("iFQuantity", shipmentDetail.getQty());
             Rd_Out_S.put("cwhcode", "035");
-            List<TaskDetail> taskDetails = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>().eq(TaskDetail::getBillDetailId, shipmentDetail.getId()));
+            List<TaskDetail> taskDetails = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>()
+                    .eq(TaskDetail::getInternalTaskType, 200)
+                    .eq(TaskDetail::getBillDetailId, shipmentDetail.getId()));
             String str = computeWarehouseType(taskDetails);
             Rd_Out_S.put("cidefine10", str);
             Rd_Out_S.put("MOCode", shipmentDetail.getNoticeNo());
@@ -793,11 +798,15 @@ public class MesReceiptController extends BaseController {
  
  
     public String computeWarehouseType(List<TaskDetail> taskDetails) {
+        String str;
+        if (taskDetails.isEmpty()) {
+            return "错误：未查询到任务！";
+        }
         int flatCount = 0;
         int uprightCount = 0;
         BigDecimal flatQty = BigDecimal.ZERO;
         BigDecimal uprightQty = BigDecimal.ZERO;
-        String str;
+
         for (TaskDetail taskDetail : taskDetails) {
             if (taskDetail.getFlat() != null && taskDetail.getFlat() == 1) {
                 flatCount++;
@@ -812,9 +821,12 @@ public class MesReceiptController extends BaseController {
         } else if (uprightCount > 0 && flatCount == 0) {
             str = "立库";
         } else if (flatCount > 0 && uprightCount > 0) {
-            str = "平库" + flatCount + "/" + "立库" + uprightQty;
+            // 移除.0或.00后缀
+            String flatQtyStr = flatQty.stripTrailingZeros().toPlainString();
+            String uprightQtyStr = uprightQty.stripTrailingZeros().toPlainString();
+            str = "平库" + flatQtyStr + "/" + "立库" + uprightQtyStr;
         } else {
-            str = "错误：未查询到任务！";
+            str = "未知错误";
         }
         return str;
     }
@@ -341,7 +341,7 @@ public class RyTask extends BaseController {
  
                 if (existingMaterial == null) {
                     saveMaterials.add(material);
-                    addApiLog("新增物料", material.toString());
+                    //addApiLog("新增物料", material.toString());
                 } else {
                     updateMaterial(existingMaterial, material);
                 }
@@ -372,7 +372,7 @@ public class RyTask extends BaseController {
         existingMaterial.setStartDate(newMaterial.getStartDate());
  
         materialMapper.update(existingMaterial, updateWrapper);
-        addApiLog("更新物料", newMaterial.toString());
+        //addApiLog("更新物料", newMaterial.toString());
     }
  
  
@@ -215,7 +215,6 @@ public class ShipmentTaskService {
                 task.setToLocation(shipmentContainerHeader.getLocationCode());
             }
         }
-
         task.setZoneCode(location.getZoneCode());
         task.setInternalTaskType(QuantityConstant.TASK_INTENERTYPE_SHIPMENT);
         if (shipmentContainerHeader.getFlat() != null && shipmentContainerHeader.getFlat() == 1) {