部分状态修改

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingOutboundController.java

@@ -511,6 +511,10 @@ public class WarehousingOutboundController {
                 List<FlowTaskNodeEntity> flowTaskNodeEntityList = flowTaskNodeService.list(flowTaskNodeEntityQueryWrapper);
                 if(flowTaskNodeEntityList != null && flowTaskNodeEntityList.size()>0 && "end".equals(flowTaskNodeEntityList.get(0).getNodeNext())) {
 
+                    //审核后出库单改为3
+                    warehousingOutboundForm.setWarehousingOutboundStatus("3");
+                    warehousingOutboundService.saveOrUpdate(warehousingOutboundForm,id,false);
+
                     //审核通过修改入库通知
                     WarehousingNotificationEntity warehousingNotificationEntity = warehousingNotificationService.getInfo(warehousingOutboundForm.getWarehousingId());
                     if (warehousingNotificationEntity!=null){

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingStorageController.java

@@ -577,6 +577,11 @@ public class WarehousingStorageController {
 ////                            warehousingNotificationEntity.setNotificationStorageNumber();
 //                        }
                         //上面注释是多次入库，现在先弄成一次性入库
+
+                        //审核后入库单改为3
+                        warehousingStorageForm.setWarehousingStorageStatus("3");
+                        warehousingStorageService.saveOrUpdate(warehousingStorageForm,id,false);
+
                         if (warehousingNotificationEntity!=null){
                             warehousingNotificationEntity.setWarehousingStatus("4");
                             warehousingNotificationEntity.setIsFlow(1);

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java

@@ -456,7 +456,7 @@ public class WorkOrderController {
                             //成品生成入库单
                             WarehousingStorageForm warehousingStorageForm=new WarehousingStorageForm();
                             warehousingStorageForm.setWarehousingStorageType("9");
-                            warehousingStorageForm.setWarehousingStorageStatus("4");
+                            warehousingStorageForm.setWarehousingStorageStatus("3");
                             warehousingStorageForm.setWarehousingId(workOrderForm.getId());
                             warehousingStorageForm.setWarehouseId(workOrderForm.getWarehouseId());
                             List<WarehousingStorageProductModel> list =new ArrayList<>();
@@ -580,7 +580,7 @@ public class WorkOrderController {
                             receiveWrapper.lambda().eq(WarehousingReceiveEntity::getBusinessId, id);
                             List<WarehousingReceiveEntity> warehousingReceiveEntityList = warehousingReceiveService.list(receiveWrapper);
                             warehousingOutboundForm.setWarehousingOutboundType("4"); //领用出库
-                            warehousingOutboundForm.setWarehousingOutboundStatus("4"); //已出库
+                            warehousingOutboundForm.setWarehousingOutboundStatus("3"); //已出库
                             warehousingOutboundForm.setOutboundReason("加工单——领用单生成出出库单");
                             warehousingOutboundForm.setWarehousingId(warehousingReceiveEntityList.get(0).getId());
                             warehousingOutboundForm.setWarehouseId(warehousingReceiveForm.getWarehouseId());
@@ -706,6 +706,8 @@ public class WorkOrderController {
                                 //返库单再生成入库单
                                 WarehousingStorageForm warehousingStorageFormRenturn=new WarehousingStorageForm();
                                 warehousingStorageFormRenturn.setWarehousingStorageType("7");
+                                warehousingStorageFormRenturn.setWarehousingStorageStatus("3");
+
                                 warehousingStorageFormRenturn.setWarehousingId(warehousingReturnEntityList.get(0).getId());
                                 warehousingStorageFormRenturn.setWarehouseId(workOrderForm.getWarehouseId());
                                 List<WarehousingStorageProductModel> list1 =new ArrayList<>();
@@ -841,7 +843,7 @@ public class WorkOrderController {
                                 List<WarehousingReportlossEntity> warehousingReportlossEntityList = warehousingReportlossService.list(reportlossEntityQueryWrapper);
 
                                 warehousingOutboundFormReportloss.setWarehousingOutboundType("6");
-                                warehousingOutboundFormReportloss.setWarehousingOutboundStatus("4");
+                                warehousingOutboundFormReportloss.setWarehousingOutboundStatus("3");
                                 warehousingOutboundFormReportloss.setWarehousingId(warehousingReportlossEntityList.get(0).getId());
                                 warehousingOutboundFormReportloss.setWarehouseId(warehousingReceiveForm.getWarehouseId());
                                 warehousingOutboundFormReportloss.setOutboundReason("加工单——报损单生成出出库单");