[CODE]: 协议管理状态变更

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseAgreementServiceImpl.java

@@ -189,8 +189,8 @@ public class TWarehouseAgreementServiceImpl implements ITWarehouseAgreementServi
             tWarehouseAgreement.setCreateBy(loginUser.getUser().getUserName());
             tWarehouseAgreement.setfDeptid(loginUser.getUser().getDeptId());
             tWarehouseAgreement.setfFeetypeid((long) fFeetypeid);
-            tWarehouseAgreement.setfStatus("0");
-            tWarehouseAgreement.setfBillstatus("1");
+            tWarehouseAgreement.setfStatus("1"); // 停用
+            tWarehouseAgreement.setfBillstatus("2"); // 暂存
             tWarehouseAgreementMapper.insertTWarehouseAgreement(tWarehouseAgreement);
             fPid = tWarehouseAgreement.getfId();
         }else{
@@ -236,12 +236,13 @@ public class TWarehouseAgreementServiceImpl implements ITWarehouseAgreementServi
             tWarehouseAgreement.setCreateBy(loginUser.getUser().getUserName());
             tWarehouseAgreement.setfDeptid(loginUser.getUser().getDeptId());
             tWarehouseAgreement.setfFeetypeid((long) fFeetypeid);
-            tWarehouseAgreement.setfStatus("0");
-            tWarehouseAgreement.setfBillstatus("1");
+            tWarehouseAgreement.setfStatus("1"); // 停用
+            tWarehouseAgreement.setfBillstatus("4");
             tWarehouseAgreementMapper.insertTWarehouseAgreement(tWarehouseAgreement);
             fPid = tWarehouseAgreement.getfId();
         }else{
             fPid = tWarehouseAgreement.getfId();
+            tWarehouseAgreement.setfBillstatus("4");
             tWarehouseAgreement.setUpdateBy(loginUser.getUser().getUserName());
             tWarehouseAgreement.setUpdateTime(new Date());
             tWarehouseAgreementMapper.updateTWarehouseAgreement(tWarehouseAgreement);
@@ -315,6 +316,8 @@ public class TWarehouseAgreementServiceImpl implements ITWarehouseAgreementServi
         Long fPid = null;
         TWarehouseAgreement tWarehouseAgreement = JSONArray.parseObject(agreement, TWarehouseAgreement.class);
         fPid = tWarehouseAgreement.getfId();
+        tWarehouseAgreement.setfStatus("1"); // 停用
+        tWarehouseAgreement.setfBillstatus("2");// 暂存
         tWarehouseAgreement.setUpdateBy(loginUser.getUser().getUserName());
         tWarehouseAgreement.setUpdateTime(new Date());
         tWarehouseAgreementMapper.updateTWarehouseAgreement(tWarehouseAgreement);

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehouseAgreementMapper.xml

@@ -65,7 +65,8 @@
                 agre.f_begindate AS fBegindate,
                 agre.f_enddate AS fEnddate,
                 agre.f_feetypeid AS fFeetypeid,
-                agre.f_billstatus AS fBillstatus
+                agre.f_billstatus AS fBillstatus,
+                agre.f_status AS fStatus
             FROM
                 t_warehouse_agreement agre
                 LEFT JOIN t_corps corp ON corp.f_id = agre.f_corpid