新增修改方法调整

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/BussinessInventoryServiceImpl.java

@@ -77,51 +77,86 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
 
     @Transactional(rollbackFor = Exception.class)
     public String AddInvOrder(UpdateInventoryReq req) {
-        BussinessInventory BI = new BussinessInventory();
-        Warehouse warehouse= warehouseService.getById(req.getWarehouseId());
-        PubOrg pubOrg=orgService.getById(req.getOrgId());
-        BeanPlusUtil.copyProperties(req,BI);
-        BI.setWarehouseName(warehouse.getName());
-        //设置单号
-        if (ObjectUtil.isNull(pubOrg.getDName()) )
+        if (StringUtils.isNotBlank(req.getId()))
         {
-            BI.setOrgName(pubOrg.getOrgName());
+            BussinessInventory BI=this.getById(req.getId());
+            Warehouse warehouse= warehouseService.getById(req.getWarehouseId());
+            PubOrg pubOrg=orgService.getById(req.getOrgId());
+            BeanPlusUtil.copyProperties(req,BI);
+            BI.setWarehouseName(warehouse.getName());
+            if (StringUtils.isNotBlank(pubOrg.getDName()) )
+            {
+                BI.setOrgName(pubOrg.getOrgName());
+            }
+            else
+            {
+                BI.setOrgName(pubOrg.getDName());
+            }
+            BI.setUpdateTime(DateTimeUtil.getCurrentDateTime());
+            //执行工作流
+            if (req.getExamineState().equals("working"))
+            {
+                StartProcessInstanceDTO startProcessInstanceDTO=new StartProcessInstanceDTO();
+                startProcessInstanceDTO.setProcessDefinitionId(req.getProcessDefinitionId());
+                startProcessInstanceDTO.setOrderId(BI.getId());
+                startProcessInstanceDTO.setOrderType("stocktakeOrder");
+                String ProcessInstanceId= FlowInstanceService.startProcessInstanceById(startProcessInstanceDTO);
+                BI.setProcessId(Long.valueOf(ProcessInstanceId));
+
+                String assigns= FlowInstanceService.GetNextAssign(ProcessInstanceId);//这里需要手动更新审核人信息
+                BI.setCurrentAssign(assigns);
+                updateById(BI);
+
+            }
+            this.save(BI);
+            return BI.getId();
         }
         else
-        {
-            BI.setOrgName(pubOrg.getDName());
-        }
-        BI.setYear(LocalDate.now().getYear());
-        BI.setMonth(Integer.valueOf(LocalDate.now().getMonthValue()));
+        {  BussinessInventory BI = new BussinessInventory();
+            Warehouse warehouse= warehouseService.getById(req.getWarehouseId());
+            PubOrg pubOrg=orgService.getById(req.getOrgId());
+            BeanPlusUtil.copyProperties(req,BI);
+            BI.setWarehouseName(warehouse.getName());
+            //设置单号
+            if (ObjectUtil.isNull(pubOrg.getDName()) )
+            {
+                BI.setOrgName(pubOrg.getOrgName());
+            }
+            else
+            {
+                BI.setOrgName(pubOrg.getDName());
+            }
+            BI.setYear(LocalDate.now().getYear());
+            BI.setMonth(Integer.valueOf(LocalDate.now().getMonthValue()));
 
             OrderNum orderNum = setOrderCode("bussinessInventory",req.getOrgId());
             String codeValue=String.format("%04d",orderNum.getNum());
-        BI.setOrderNum(orderNum.getBussinessType()+orderNum.getYear()+
+            BI.setOrderNum(orderNum.getBussinessType()+orderNum.getYear()+
                     String.format("%02d", LocalDateTime.now().getMonth().getValue())+
                     String.format("%02d",LocalDateTime.now().getDayOfMonth())+codeValue);
 
-        BI.setCreateTime(DateTimeUtil.getCurrentDateTime());
-        BI.setUpdateTime(DateTimeUtil.getCurrentDateTime());
-        BI.setInventoryState("waitting");
-        BI.setExamineState("none");
-        //执行工作流
-        if (req.getExamineState().equals("working"))
-        {
-            StartProcessInstanceDTO startProcessInstanceDTO=new StartProcessInstanceDTO();
-            startProcessInstanceDTO.setProcessDefinitionId(req.getProcessDefinitionId());
-            startProcessInstanceDTO.setOrderId(BI.getId());
-            startProcessInstanceDTO.setOrderType("stocktakeOrder");
+            BI.setCreateTime(DateTimeUtil.getCurrentDateTime());
+            BI.setUpdateTime(DateTimeUtil.getCurrentDateTime());
+            BI.setInventoryState("waitting");
+            //执行工作流
+            if (req.getExamineState().equals("working"))
+            {
+                StartProcessInstanceDTO startProcessInstanceDTO=new StartProcessInstanceDTO();
+                startProcessInstanceDTO.setProcessDefinitionId(req.getProcessDefinitionId());
+                startProcessInstanceDTO.setOrderId(BI.getId());
+                startProcessInstanceDTO.setOrderType("stocktakeOrder");
 //            startProcessInstanceDTO.setUserId(req.getUserId());
-            String ProcessInstanceId= FlowInstanceService.startProcessInstanceById(startProcessInstanceDTO);
-            BI.setProcessId(Long.valueOf(ProcessInstanceId));
+                String ProcessInstanceId= FlowInstanceService.startProcessInstanceById(startProcessInstanceDTO);
+                BI.setProcessId(Long.valueOf(ProcessInstanceId));
 
-            String assigns= FlowInstanceService.GetNextAssign(ProcessInstanceId);//这里需要手动更新审核人信息
-            BI.setCurrentAssign(assigns);
-            updateById(BI);
+                String assigns= FlowInstanceService.GetNextAssign(ProcessInstanceId);//这里需要手动更新审核人信息
+                BI.setCurrentAssign(assigns);
+                updateById(BI);
+
+            }
+            this.save(BI);
+            return BI.getId();}
 
-        }
-        this.save(BI);
-        return BI.getId();
     }
 
     @Override