新增修改方法调整

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

@@ -77,7 +77,42 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
 
     @Transactional(rollbackFor = Exception.class)
     public String AddInvOrder(UpdateInventoryReq req) {
-        BussinessInventory BI = new BussinessInventory();
+        if (StringUtils.isNotBlank(req.getId()))
+        {
+            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
+        {  BussinessInventory BI = new BussinessInventory();
             Warehouse warehouse= warehouseService.getById(req.getWarehouseId());
             PubOrg pubOrg=orgService.getById(req.getOrgId());
             BeanPlusUtil.copyProperties(req,BI);
@@ -103,7 +138,6 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
             BI.setCreateTime(DateTimeUtil.getCurrentDateTime());
             BI.setUpdateTime(DateTimeUtil.getCurrentDateTime());
             BI.setInventoryState("waitting");
-        BI.setExamineState("none");
             //执行工作流
             if (req.getExamineState().equals("working"))
             {
@@ -121,7 +155,8 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
 
             }
             this.save(BI);
-        return BI.getId();
+            return BI.getId();}
+
     }
 
     @Override