huangfuli 4 年之前
父節點
當前提交
084f0ac077

+ 2 - 2
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/TranProcessInfo.java

@@ -146,8 +146,8 @@ public class TranProcessInfo extends BaseModel<TranProcessInfo> {
     /**
      * 接单时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date receivingDate;
     /**
      * 状态标识

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

@@ -316,10 +316,12 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
                     .eq("contract_no",inOutWarehouseTask.getMoveTaskNo()));
             //累计退库量
             String stockReturnCount = "";
-            for(InOutWarehouseTask inOutWarehouseTask1 : inOutWarehouseTaskList1){
-                stockReturnCount = stockReturnCount + inOutWarehouseTask1.getStockReturnCount();
-            }
-                inOutWarehouseTask.setStockReturnCount(stockReturnCount);
+                for (InOutWarehouseTask inoutwarehouse : inOutWarehouseTaskList1) {
+                    if (StringUtils.isEmpty(stockReturnCount)) {
+                        stockReturnCount = "0";
+                    }
+                    stockReturnCount = String.valueOf(Float.valueOf(stockReturnCount) + inoutwarehouse.getWeight());
+                }
             });
         }
         return inOutWarehouseTaskList;