审批系统修改

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/ApprovalOrderServiceImpl.java

@@ -275,7 +275,7 @@ public class ApprovalOrderServiceImpl implements ApprovalOrderService {
             /*productionItem.setItemShouldStorage(productionItem.getItemLackNumber());*/
             productionItem.setItemLackNumber(productionItem.getItemLackNumber() - jsonRecords.getInt("actualStorage"));
             productionItem.setItemActualStorage(productionItem.getItemActualStorage()+jsonRecords.getInt("actualStorage"));
-            productionItem.setItemCanpickNumber(productionItem.getItemActualStorage()+jsonRecords.getInt("actualStorage"));
+            productionItem.setItemCanpickNumber(productionItem.getItemCanpickNumber()+jsonRecords.getInt("actualStorage"));
             if(approvalOrderMapper.updateProductionItem(productionItem) < 1){
                 return new ResponseJson(200, "修改审批产品项失败", 500);
             }
@@ -646,6 +646,23 @@ public class ApprovalOrderServiceImpl implements ApprovalOrderService {
                         }
                     }
                 }else{
+                    //修改生产审批项的可提货数量
+                    ApprovalInfo approval = new ApprovalInfo();
+                    approval.setApprovalId(ainfo.getApprovalId());
+                    List<ApprovalInfo> listApprovalInfo =  approvalOrderMapper.listApprovalInfo(approval);
+                    for(ApprovalApplyPickItem item : listApprovalInfo.get(0).getApprovalApplyPick().getListApplyPickItem()){
+                        //查询生产审批id
+                        ApprovalProductionItem productionItem = approvalOrderMapper.getProductionItem(item.getProductionItemId());
+                        ApprovalProductionItem productItem = new ApprovalProductionItem();
+                        productItem.setItemId(item.getProductionItemId());
+                        productItem.setItemCanpickNumber(productionItem.getItemCanpickNumber()+item.getItemProductNum());
+                        if(approvalOrderMapper.updateProductionItem(productItem) < 1){
+                            rj = ResponseJson.getFAILURE();
+                            rj.setResultMsg("返回生产审批可提货数量失败！");
+                            return  rj;
+                        }
+                    }
+
                     //通知申请人该提货审批已驳回
                     ApprovalApplyPick  approvalApplyPick = new ApprovalApplyPick();
                     approvalApplyPick.setApprovalId(approvalInfo.getApprovalId());
@@ -721,6 +738,24 @@ public class ApprovalOrderServiceImpl implements ApprovalOrderService {
                             return  rj;
                         }
                     }
+                    /*//如果为审批状态为已完成提货则需要修改状态为已完成部分提货
+                    if(listApprovalInfo.get(0).getApprovalApplyPick().getProductionApprovalId() == null){
+                        rj = ResponseJson.getFAILURE();
+                        rj.setResultMsg("提货订单关联生产审批id为空！");
+                        return  rj;
+                    }
+                    if(approvalOrderMapper.getApprovalInfoById(listApprovalInfo.get(0).getApprovalApplyPick().getProductionApprovalId()).getApprovalStatus() == 10){
+                        ApprovalInfo infos = new ApprovalInfo();
+                        infos.setApprovalId(listApprovalInfo.get(0).getApprovalApplyPick().getProductionApprovalId());
+                            //修改关联生产审批信息状态为已完成部分提货
+                            info.setApprovalStatusDetails("已完成部分提货");
+                            info.setApprovalStatus(11);
+                            if(approvalOrderMapper.updateApprovalInfo(info) < 1){
+                                rj = ResponseJson.getFAILURE();
+                                rj.setResultMsg("修改关联审批信息状态为已完成部分提货失败！");
+                                return  rj;
+                            }
+                    }*/
                 }
                 //调用第三方revokeTask接口执行撤销
                 approvalTaskService.revokeTask(approvalInfo.getActivitiId(),"业务员撤销审核");

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/mapper/approvalOrderMapper.xml

@@ -58,6 +58,7 @@
     <result column="apply_pick_remk" property="applyPickRemk" jdbcType="VARCHAR" />
     <result column="apply_pick_create_time" property="applyPickCreateTime" jdbcType="TIMESTAMP" />
     <result column="apply_pick_update_time" property="applyPickUpdateTime" jdbcType="TIMESTAMP" />
+    <result column="production_approval_id" property="productionApprovalId" jdbcType="INTEGER" />
     <collection property="listApplyPickItem" column="apply_pick_id" ofType="ApprovalApplyPickItem" select="listApplyPickItem"/>
   </resultMap>
 
@@ -365,6 +366,9 @@
       <if test="selectState != null and selectState != '' and selectState == 5">
         AND ai.approval_status in (1,4)
       </if>
+      <if test="selectState != null and selectState != '' and selectState == 6">
+        AND ai.approval_status in (6,7,11)
+      </if>
     </where>
     group by ai.approval_id
     ORDER BY ai.approval_id DESC
@@ -413,7 +417,8 @@
     aap.apply_pick_struts,
     aap.apply_pick_remk,
     aap.apply_pick_create_time,
-    aap.apply_pick_update_time
+    aap.apply_pick_update_time,
+    aap.production_approval_id
     from tb_rst_approval_apply_pick aap
     where
         aap.approval_id = #{approvalId}
@@ -461,7 +466,8 @@
     aapi.item_product_box_number itemProductBoxNumber,
     aapi.item_create_time itemCreateTime,
     aapi.item_update_time itemUpdateTime,
-    aapi.item_external_model  itemExternalModel
+    aapi.item_external_model itemExternalModel,
+    aapi.production_item_id productionItemId
     from tb_rst_approval_apply_pick_item aapi
     where
         aapi.apply_pick_id = #{applyPickId}
@@ -556,13 +562,13 @@
   <update id="updateProductionItem" parameterType="ApprovalProductionItem">
     update tb_rst_approval_production_item
     <set >
-      <if test="itemActualStorage != null and itemActualStorage != ''" >
+      <if test="itemActualStorage != null" >
         item_actual_storage = #{itemActualStorage},
       </if>
-      <if test="itemLackNumber != null and itemLackNumber != ''" >
+      <if test="itemLackNumber != null" >
         item_lack_number = #{itemLackNumber},
       </if>
-      <if test="itemCanpickNumber != null and itemCanpickNumber != ''" >
+      <if test="itemCanpickNumber != null" >
         item_canpick_number = #{itemCanpickNumber}
       </if>
     </set>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/approval/ApplyPickController.java

@@ -121,6 +121,11 @@ public class ApplyPickController {
         approvalApplyPick.setApplyPickStruts(1);
         //获取审批任务id
         Map<String, Object> taskinfo = approvalTaskService.salesmanSubmitApply(2);
+        for(int i = 0; i<listApplyPickItem.size();i++){
+            if (listApplyPickItem.get(i).getItemProductNum() == 0){
+                listApplyPickItem.remove(i);
+            }
+        }
         try{
           applyPickService.save(approvalApplyPick,openId,taskinfo,approvalProductionContractList);
         }catch (Exception e){
@@ -270,8 +275,8 @@ public class ApplyPickController {
             return  rj;
         }
 
-        //查询生产审批项可提货数量,并修改可提货数量
-        ApprovalInfo appinfo = approvalOrderService.getApprovalInfoById(aap.getProductionApprovalId());
+        //查询生产审批项可提货数量
+        /*ApprovalInfo appinfo = approvalOrderService.getApprovalInfoById(aap.getProductionApprovalId());
         Integer canpickNumber = 0;//可提货数量
         for(ApprovalProductionItem item : appinfo.getApprovalProduction().getListProductionItem()){
             canpickNumber += item.getItemCanpickNumber();
@@ -297,7 +302,7 @@ public class ApplyPickController {
                 rj.setResultMsg("修改关联审批信息状态为已完成提货失败！");
                 return  rj;
             }
-        }
+        }*/
         return rj;
     }
 }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/approval/ApprovalController.java

@@ -87,13 +87,12 @@ public class ApprovalController {
         if(deliveryDate == null ){
             return  ResponseJson.getFAILURE();
         }
-        if(inspectionTime == null ){
-            return  ResponseJson.getFAILURE();
-        }
+
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
         approvalProduction.setProductionDeliveryDate(format.parse(deliveryDate));
-        approvalProduction.setInspectionTime(format.parse(inspectionTime));
-
+        if(inspectionTime != null ){
+            approvalProduction.setInspectionTime(format.parse(inspectionTime));
+        }
         //封装生产审批产品项
         List<ApprovalProductionItem> listApprovalProductionItem = new ArrayList<ApprovalProductionItem>();
             JSONArray jsonProductionItems = JSONArray.fromObject(productionItems);
@@ -659,24 +658,24 @@ public class ApprovalController {
         }
         return rj;
     }
-    /*@ResponseBody
+    @ResponseBody
     @RequestMapping(value = "/deploymentPrecessDefinition")
     public void deploymentPrecessDefinition(){
-        getBpmnModel();
-        repositoryService.deleteDeployment("310008",true);
-        repositoryService.deleteDeployment("427508",true);
-        repositoryService.deleteDeployment("427501",true);
-        repositoryService.deleteDeployment("422501",true);
-        *//*Deployment deployment = repositoryService.createDeployment()
+        /*getBpmnModel();*/
+        /*repositoryService.deleteDeployment("520001",true);
+        repositoryService.deleteDeployment("520005",true);*/
+        /*repositoryService.deleteDeployment("427501",true);
+        repositoryService.deleteDeployment("422501",true);*/
+        Deployment deployment = repositoryService.createDeployment()
                 .key("GenerationApproval")
                 .name("提交审批流程")
                 .addClasspathResource("RST.bpmn")
                 .deploy();
-        Deployment deployment = repositoryService.createDeployment()
+        Deployment deployment2 = repositoryService.createDeployment()
                 .key("ApplicationForDelivery")
                 .name("提交提货订单审批流程")
                 .addClasspathResource("pickRst.bpmn")
-                .deploy();*//*
+                .deploy();
         //获取审批任务id
         Map<String, Object> taskinfo = approvalTaskService.salesmanSubmitApply(1);
         String[] split = (String[])taskinfo.get("users");
@@ -690,5 +689,5 @@ public class ApprovalController {
         }
 
 
-    }*/
+    }
 }