소스 검색

提交入库确认增加返回时间戳校验

buck 3 년 전
부모
커밋
249cee336f
1개의 변경된 파일2개의 추가작업 그리고 1개의 파일을 삭제
  1. 2 1
      ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

+ 2 - 1
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -612,7 +612,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 mixDate = minDate;
             }
             for (TWarehousebillsitems wbItem : warehousebillsitemsList) {
-                boolean warehouseStatus = "SJRK".equals(billsType) || "SJCK".equals(billsType) || "CKDB".equals(billsType) || "HWTG".equals(billsType);
+                boolean warehouseStatus = "SJRK".equals(billsType) || "SJCK".equals(billsType) || "CKDB".equals(billsType) || "HWTG".equals(billsType) || "CDZZ".equals(billsType);
                 // 仓储计费日期
                 wbItem.setfBilltype(billsType);
                 if ("SJRK".equals(billsType) && warehouseBills.getfId() != null && "0".equals(warehouseBills.getfChargetype())) {
@@ -3286,6 +3286,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         tWarehouseBills.setfNetweight(itemInFo.getfNetweight());
         tWarehouseBills.setfGrossweight(itemInFo.getfGrossweight());
         tWarehouseBillsMapper.updateTWarehousebills(tWarehouseBills);
+        map.put("fDateChanged", tWarehouseBills.getfDateChanged());
         map.put("warehousebills", tWarehouseBills);
         map.put("warehousebillsitems", warehousebillsitemsList);
         return AjaxResult.success("成功", map);