修改

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/InOutWarehouseTaskServiceImpl.java

@@ -60,6 +60,16 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
             if ("1".equals(inOutWarehouseTask.getTaskTypeKey()) || "2".equals(inOutWarehouseTask.getTaskTypeKey())){
                 inOutWarehouseTask.setRelevanceId(inOutWarehouseTask.getId());
             }
+            //新增移库出库任务时，获取发货库和出库量
+            else if("3".equals(inOutWarehouseTask.getTaskTypeKey()) && "1".equals(inOutWarehouseTask.getInOutFlag())){
+                inOutWarehouseTask.setSendWarehouse(inOutWarehouseTask.getWarehouseName());
+                inOutWarehouseTask.setDeliveryVolume(inOutWarehouseTask.getWeight());
+            }
+            //新增移库入库任务时，获取收货库和入库量
+            else if("3".equals(inOutWarehouseTask.getTaskTypeKey()) && "2".equals(inOutWarehouseTask.getInOutFlag())){
+                inOutWarehouseTask.setReceiveWarehouse(inOutWarehouseTask.getWarehouseName());
+                inOutWarehouseTask.setStorageVolume(inOutWarehouseTask.getWeight());
+            }
             // 操作主表数据
             this.insert(inOutWarehouseTask);
 
@@ -268,14 +278,14 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
                 List<InOutWarehouseTask> inOutWarehouseTaskList = inOutWarehouseTaskService.selectList(new EntityWrapper<InOutWarehouseTask>()
                         .eq("task_type_key","4")
                         .eq("contract_no",inOutWarehouseTaska.getMoveTaskNo())
-                        .eq("in_out_flag","2").orderBy("send_warehouse_name").groupBy("send_warehouse_name"));
-                if(!CollectionUtils.isEmpty(inOutWarehouseTaskList)){
-                    Float stockReturn = 0f;
-                    for(InOutWarehouseTask inoutwarehouse :inOutWarehouseTaskList){
-                        stockReturn = stockReturn + inoutwarehouse.getStockReturn();
+                        .eq("in_out_flag","2").orderBy("send_warehouse").groupBy("send_warehouse"));
+                if(!CollectionUtils.isEmpty(inOutWarehouseTaskList)) {
+                    for (InOutWarehouseTask inoutwarehouse : inOutWarehouseTaskList) {
+                        if (StringUtils.isEmpty(stockReturnCount)) {
+                            stockReturnCount = "0";
+                        }
+                        stockReturnCount = String.valueOf(Float.valueOf(stockReturnCount) + inoutwarehouse.getWeight());
                     }
-                    inOutWarehouseTask.setStockReturnCount(String.valueOf(stockReturn));
-                    inOutWarehouseTask.setInOutWarehouseTaskList(inOutWarehouseTaskList);
                 }
 
             }

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/InOutWarehouseTaskMapper.xml

@@ -83,6 +83,7 @@
         a.id as id,
         a.contract_no as contractNo,
         a.in_out_task_no as inOutTaskNo,
+        a.move_task_no as moveTaskNo,
         a.warehouse_name as warehouseName,
         b.warehouse_name as warehouseNameIn,
         a.in_out_type as inOutType,
@@ -120,7 +121,7 @@
     <!-- 获得移库任务总数 -->
     <select id="getMoveCountByCondition" parameterType="Map" resultType="java.lang.Integer">
         SELECT
-        COUNT(id)
+        COUNT(a.id)
         FROM in_out_warehouse_task a
         left join
         in_out_warehouse_task b