Browse Source

凯和业务修改

lazhaoqian 4 years ago
parent
commit
bd491285fc

+ 4 - 3
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -848,13 +848,14 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         JSONArray jsonCrArray = JSONArray.parseArray(tWarehousebillsCntritems);
         List<TWarehousebillsCntritems> tWarehousebillsCntrs = JSONObject.parseArray(jsonCrArray.toJSONString(), TWarehousebillsCntritems.class);
         TWarehouseBills tWarehouseBills = tWarehouseBillsMapper.selectTWarehousebillsById(warehouseBills.getfId());
-        if (!"7".equals(tWarehouseBills.getfBillstatus()) || !"8".equals(tWarehouseBills.getfBillstatus())
-                || !"6".equals(tWarehouseBills.getfBillstatus())) {
+        if (tWarehouseBills.getfBillstatus()==7L
+                || tWarehouseBills.getfBillstatus()==6L) {
+        }else {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("当前数据不允许暂存");
         }
         warehouseBills.setfBillstatus(7L);
-        int i = tWarehouseBillsMapper.updateById(warehouseBills);
+        int i = tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
         int cntritemsfPid = tWarehousebillsCntritemsMapper.deleteTWarehousebillsCntritemsfPid(warehouseBills.getfId());
         if (CollectionUtils.isNotEmpty(tWarehousebillsCntrs)) {
             for (TWarehousebillsCntritems warehousebillsCntritems : tWarehousebillsCntrs) {