6.3问题修改

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java

@@ -698,7 +698,7 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
                 entitys.setWarehousingStorageId(entity.getId());
                     entitys.setDateManufacture(new Date());
                 if(isSave){
-                    entitys.setBatchNumber(generaterSwapUtil.getBillNumber("picihao", false));
+//                    entitys.setBatchNumber(generaterSwapUtil.getBillNumber("picihao", false));
                 }else{
                 }
                 warehousingStorageProductService.saveOrUpdate(entitys);

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

@@ -716,20 +716,20 @@ public class WarehousingStorageController {
                         //inventoryLogEntity.setRetailPrice();//零售价
                         inventoryLogService.saveOrUpdate(inventoryLogEntity);
                     }
-                        if (entity.getWarehousingStorageType().equals("1")){
+//                        if (entity.getWarehousingStorageType().equals("1")){
-                            YunguanPurchaseInBoundModel yunguanPurchaseInBoundModel = warehousingStorageService.purchaseInBoundByYunGuan(id);
+//                            YunguanPurchaseInBoundModel yunguanPurchaseInBoundModel = warehousingStorageService.purchaseInBoundByYunGuan(id);
-                            List<YunguanPurchaseInBoundModel> yunguanPurchaseProductInBoundModelList = warehousingStorageService.purchaseInBoundProductByYunGuanInfo(id);
+//                            List<YunguanPurchaseInBoundModel> yunguanPurchaseProductInBoundModelList = warehousingStorageService.purchaseInBoundProductByYunGuanInfo(id);
-                            for (YunguanPurchaseInBoundModel model : yunguanPurchaseProductInBoundModelList){
+//                            for (YunguanPurchaseInBoundModel model : yunguanPurchaseProductInBoundModelList){
-                                BeanMergeUtil.merge(model,yunguanPurchaseInBoundModel);
+//                                BeanMergeUtil.merge(model,yunguanPurchaseInBoundModel);
-                            }
+//                            }
-                            if (yunguanPurchaseProductInBoundModelList != null && yunguanPurchaseProductInBoundModelList.size()>0) {
+//                            if (yunguanPurchaseProductInBoundModelList != null && yunguanPurchaseProductInBoundModelList.size()>0) {
-                                JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/stoIn", "POST", JsonUtil.getObjectToString(yunguanPurchaseProductInBoundModelList));
+//                                JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/stoIn", "POST", JsonUtil.getObjectToString(yunguanPurchaseProductInBoundModelList));
-                                if (ObjectUtil.isNotEmpty(purchaseCode)){
+//                                if (ObjectUtil.isNotEmpty(purchaseCode)){
-                                    if (purchaseCode.get("code").equals("200")) {
+//                                    if (purchaseCode.get("code").equals("200")) {
-                                    }
+//                                    }
-                                }
+//                                }
-                            }
+//                            }
-                        }
+//                        }
                 }
                 }
             }catch(Exception e){

jnpf-java-boot/jnpf-web/src/views/scm/workorder/form.vue

@@ -868,7 +868,7 @@ export default {
       },
       statusOptions: [{ "fullName": "待加工", "id": "1" }, { "fullName": "加工中", "id": "2" }],
       statusProps: { "label": "fullName", "value": "id" },
-      typeOptions: [{ "fullName": "完工入库", "id": "1" }, { "fullName": "计划加工", "id": "2" }, { "fullName": "其他加工", "id": "3" }],
+      typeOptions: [{ "fullName": "完工入库", "id": "1" }, { "fullName": "计划加工", "id": "2" }],
       typeProps: { "label": "fullName", "value": "id" },
       businessfactoryIdcolumnOptions: [{ "label": "工厂编码", "value": "code" }, { "label": "工厂名称", "value": "name" },],
       businessIdcolumnOptions: [{ "label": "生产线编码", "value": "code" }, { "label": "生产线名称", "value": "name" },],