凯和拆单修改

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

@@ -6256,24 +6256,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         }
         //拆单数量
         Long number = 0L;
-        //判断是否生成审批流
-        Long billStatus = null;
-        Long  actId = 410L;
-        String key = "khwarehouse.warehousebills.ApprovalFlow";
-        boolean isApprove = false;//是否开启审批流
-        SysConfig sysConfig = sysConfigMapper.checkConfigKeyUnique(key);
-        if (StringUtils.isNull(sysConfig)) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return AjaxResult.error("系统参数异常，未找到开启审批流参数");
-        }
-        if ("0".equals(sysConfig.getConfigValue())) {
-            isApprove = true;
-        }
-        if (isApprove) {
-            billStatus = 4L;
-        } else {
-            billStatus = 6L;
-        }
         if (warehouseBills.getfId() == null) {
             String billNoNew = this.getBillNoNew(selectOne.getfMblno());
             String billNo = billnoSerialServiceImpl.getBillNo("SE", warehouseBills.getfBsdate());
@@ -6283,7 +6265,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             warehouseBills.setCreateBy(SecurityUtils.getUsername());
             warehouseBills.setfBilltype("KHDD");
             warehouseBills.setfTypeid(1);
-            warehouseBills.setfBillstatus(billStatus);
             warehouseBills.setfOriginalbillno(fOriginalbillno);
             warehouseBills.setfDeptid(SecurityUtils.getLoginUser().getUser().getDeptId());
             warehouseBills.setfBsdeptid(SecurityUtils.getLoginUser().getUser().getDeptId());
@@ -6409,42 +6390,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 tWarehousebillsCntritemsMapper.deleteTWarehousebillsCntritemOlder(selectOne.getfId(),warehousebillsCntritems.getfCntrno());
             }
         }
-        if (isApprove) {
-            AuditItems auditItems = new AuditItems();
-            auditItems.setLevelId(0L);
-            auditItems.setBillId(warehouseBills.getfId());
-            auditItems.setActId(actId);
-            auditItems.setIffinalItem("F");
-            auditItems.setBillNo(warehouseBills.getfBillno());
-            // 存储委托方（货权方）
-            auditItems.setRefno1(warehouseBills.getfCorpid() + "");
-            // 存储业务类型（业务类型）
-            auditItems.setRefno2(warehouseBills.getfBilltype());
-            // 存储提单号（提单号）
-            if (StringUtils.isNotEmpty(warehouseBills.getfMblno())) {
-                auditItems.setRefno3(warehouseBills.getfMblno());
-            } else {
-                auditItems.setRefno3(warehouseBills.getfBillno());
-            }
-            auditItems.setSendUserId(SecurityUtils.getLoginUser().getUser().getUserId());
-            auditItems.setSendName(SecurityUtils.getUsername());
-            auditItems.setSendTime(new Date());
-            auditItems.setAuditUserId(SecurityUtils.getLoginUser().getUser().getUserId());
-            auditItems.setAuditItem(new Date());
-            auditItems.setAuditOpTime(new Date());
-            auditItems.setAuditMsg("提交");
-            auditItems.setAuditStatus("O");
-            auditItems.setFidStatus("f_billstatus");
-            auditItems.setTimes(1L);
-            AjaxResult approvalFlow = auditItemsService.createApprovalFlow(auditItems);
-//            Long code = Long.valueOf(String.valueOf(approvalFlow.get("code"))).longValue();
-            String code = approvalFlow.get("code").toString();
-//                Long code = Long.valueOf(String.valueOf(ajaxResult.get("code"))).longValue();
-            if ("500".equals(code)) {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            }
-            return approvalFlow;
-        }
         return AjaxResult.success();
 }
 
@@ -6456,7 +6401,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     public String getBillNoNew(String fbillNo){
         List<String> strings = Arrays.asList(StringUtils.split("A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z", ","));
         for (String string : strings) {
-            String billno = fbillNo+"-"+string;
+            String billno = fbillNo+string;
             TWarehouseBills tWarehouseBills = new TWarehouseBills();
             tWarehouseBills.setfMblno(billno);
             List<Map<String, Object>> maps = tWarehouseBillsMapper.ruoYiVersionOrderList(tWarehouseBills);