diff --git a/op-auth/src/main/resources/bootstrap.yml b/op-auth/src/main/resources/bootstrap.yml index 300cb95e9..b2c96afa2 100644 --- a/op-auth/src/main/resources/bootstrap.yml +++ b/op-auth/src/main/resources/bootstrap.yml @@ -15,14 +15,14 @@ spring: # username: nacos # password: sfnacos2023 # 服务注册地址 - #--spring.cloud.nacos.discovery.namespace=ywl --spring.cloud.nacos.config.namespace=ywl + #--spring.cloud.nacos.discovery.namespace=zxl --spring.cloud.nacos.config.namespace=zxl namespace: lanju-op - group: ywl + group: zxl server-addr: 140.249.53.142:8848 config: #命名空间 namespace: lanju-op - group: ywl + group: zxl # 配置中心地址 server-addr: 140.249.53.142:8848 # 配置文件格式 diff --git a/op-gateway/src/main/resources/bootstrap.yml b/op-gateway/src/main/resources/bootstrap.yml index fe99599f3..a6f945f4d 100644 --- a/op-gateway/src/main/resources/bootstrap.yml +++ b/op-gateway/src/main/resources/bootstrap.yml @@ -17,13 +17,13 @@ spring: # password: sfnacos2023 # namespace: lanju-op namespace: lanju-op - group: ywl + group: zxl # 服务注册地址 server-addr: 140.249.53.142:8848 config: #命名空间 namespace: lanju-op - group: ywl + group: zxl # 配置中心地址 server-addr: 140.249.53.142:8848 # 配置文件格式 diff --git a/op-modules/op-device/src/main/resources/bootstrap.yml b/op-modules/op-device/src/main/resources/bootstrap.yml index 0234c4d51..ef6af8659 100644 --- a/op-modules/op-device/src/main/resources/bootstrap.yml +++ b/op-modules/op-device/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: namespace: lanju-op - group: ywl + group: zxl # 服务注册地址 server-addr: 140.249.53.142:8848 config: namespace: lanju-op - group: ywl + group: zxl #命名空间 #group: local # 配置中心地址 diff --git a/op-modules/op-energy/src/main/resources/bootstrap.yml b/op-modules/op-energy/src/main/resources/bootstrap.yml index 8188ee1a9..e1009be07 100644 --- a/op-modules/op-energy/src/main/resources/bootstrap.yml +++ b/op-modules/op-energy/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: namespace: lanju-op - group: ywl + group: zxl # 服务注册地址 server-addr: 140.249.53.142:8848 config: namespace: lanju-op - group: ywl + group: zxl #命名空间 #group: local # 配置中心地址 diff --git a/op-modules/op-file/src/main/resources/bootstrap.yml b/op-modules/op-file/src/main/resources/bootstrap.yml index 0c2780bc7..3cc00fca8 100644 --- a/op-modules/op-file/src/main/resources/bootstrap.yml +++ b/op-modules/op-file/src/main/resources/bootstrap.yml @@ -15,13 +15,13 @@ spring: discovery: # 服务注册地址 namespace: lanju-op - group: ywl + group: zxl # 服务注册地址 server-addr: 140.249.53.142:8848 config: # 配置中心地址 namespace: lanju-op - group: ywl + group: zxl # 服务注册地址 server-addr: 140.249.53.142:8848 # 配置文件格式 diff --git a/op-modules/op-gen/src/main/resources/bootstrap.yml b/op-modules/op-gen/src/main/resources/bootstrap.yml index 952af23e2..1eaccce20 100644 --- a/op-modules/op-gen/src/main/resources/bootstrap.yml +++ b/op-modules/op-gen/src/main/resources/bootstrap.yml @@ -14,13 +14,13 @@ spring: nacos: discovery: namespace: lanju-op - group: ywl + group: zxl # 服务注册地址 server-addr: 140.249.53.142:8848 config: #命名空间 namespace: lanju-op - group: ywl + group: zxl # 配置中心地址 server-addr: 140.249.53.142:8848 # 配置文件格式 diff --git a/op-modules/op-job/src/main/resources/bootstrap.yml b/op-modules/op-job/src/main/resources/bootstrap.yml index 52a01cdd6..efda0fbaf 100644 --- a/op-modules/op-job/src/main/resources/bootstrap.yml +++ b/op-modules/op-job/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: namespace: lanju-op - group: ywl + group: zxl # 服务注册地址 server-addr: 140.249.53.142:8848 config: namespace: lanju-op - group: ywl + group: zxl #命名空间 #group: local # 配置中心地址 diff --git a/op-modules/op-mes/src/main/resources/bootstrap.yml b/op-modules/op-mes/src/main/resources/bootstrap.yml index 222424bdc..44e0b2783 100644 --- a/op-modules/op-mes/src/main/resources/bootstrap.yml +++ b/op-modules/op-mes/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: namespace: lanju-op - group: ywl + group: zxl # 服务注册地址 server-addr: 140.249.53.142:8848 config: namespace: lanju-op - group: ywl + group: zxl #命名空间 #group: local # 配置中心地址 diff --git a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java index c408f8ea3..5e646888a 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java @@ -167,12 +167,10 @@ public class ProOrderWorkorderController extends BaseController { ArrayList strings = new ArrayList<>(); for (ProOrderWorkorder proOrderWorkorder : proOrderWorkorders) { String status = proOrderWorkorder.getStatus(); -// strings.add(status); - // 更新代码逻辑-wws if (status.equals("w0")){ strings.add(proOrderWorkorder.getWorkorderId()); } else { - throw new ServiceException("工单已经下单，不能删除！"); + throw new ServiceException("工单已经下发，不能删除！"); } // 判断是否含有湿料计划 boolean值（存在为true，不存在为false） if (proWetMaterialPlanDetailService.selectProWetMaterialPlanDetailByWorkId(proOrderWorkorder.getWorkorderId())) { @@ -180,36 +178,6 @@ public class ProOrderWorkorderController extends BaseController { } } String[] orderWorkerIds= strings.toArray(new String[0]); - // 更新代码逻辑-wws - /* - for (String orderWorkerId : orderWorkerIds) { - if (orderWorkerId.equals("w0")){ - return toAjax(proOrderWorkorderService.deleteProOrderWorkorderByWorkorderIds(workorderIds)); - } else { - throw new ServiceException("工单已经下单，不能删除！"); - } - } - */ - - -// ProOrderWorkorder proOrderWorkorder = new ProOrderWorkorder(); -// String status = proOrderWorkorder.getStatus(); -// ProOrder proOrder = new ProOrder(); -// String status1 = proOrder.getStatus(); -// if (proOrderWorkorder != null) { -// int parsedStatus1 = Integer.parseInt(status1); -// int parsedStatus = Integer.parseInt(status); -// -// if (parsedStatus1 == 1 && parsedStatus == 0) { -// proOrderWorkorderService.deleteProOrderWorkorderByWorkorderIds(workorderIds); -// } else { -// throw new ServiceException("订单未拆分或工单已经下单"); -// } -// } - - // 更新代码逻辑-wws - //return toAjax(proOrderWorkorderService.deleteProOrderWorkorderByWorkorderIds(workorderIds)); - return toAjax(proOrderWorkorderService.deleteProOrderWorkorderByWorkorderIds(orderWorkerIds)); } diff --git a/op-modules/op-plan/src/main/resources/bootstrap.yml b/op-modules/op-plan/src/main/resources/bootstrap.yml index dd923a570..11a152774 100644 --- a/op-modules/op-plan/src/main/resources/bootstrap.yml +++ b/op-modules/op-plan/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: namespace: lanju-op - group: ywl + group: zxl # 服务注册地址 server-addr: 140.249.53.142:8848 config: namespace: lanju-op - group: ywl + group: zxl #命名空间 #group: local # 配置中心地址 diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderBatchMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderBatchMapper.xml index 2b2ea98f7..01e880ea4 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderBatchMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderBatchMapper.xml @@ -132,12 +132,9 @@ delete from pro_order_workorder_batch where workorder_id in - ( - select workorder_id from pro_order_workorder where order_id in #{workorderId} - ) diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml index 076a7382f..03bfb2c71 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml @@ -387,7 +387,7 @@ - delete from pro_order_workorder where order_id in + delete from pro_order_workorder where workorder_id in #{workorderId} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java index 27664c9cb..893ce664b 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java @@ -25,7 +25,7 @@ public class QuaController { @PostMapping("/saveQcProCheck") public R saveQcProCheck(@RequestBody QcProCheck qcProCheck) { - qcProCheckService.saveQcProCheck(qcProCheck); + //qcProCheckService.saveQcProCheck(qcProCheck); if (qcProCheck.getIsqua()=="1") { WCSDTO wcsdto = new WCSDTO(); wcsdto.setFactory(qcProCheck.getFactoryCode()); diff --git a/op-modules/op-quality/src/main/resources/bootstrap.yml b/op-modules/op-quality/src/main/resources/bootstrap.yml index ee092600c..61ed72910 100644 --- a/op-modules/op-quality/src/main/resources/bootstrap.yml +++ b/op-modules/op-quality/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: namespace: lanju-op - group: ywl + group: zxl # 服务注册地址 server-addr: 140.249.53.142:8848 config: namespace: lanju-op - group: ywl + group: zxl #命名空间 #group: local # 配置中心地址 diff --git a/op-modules/op-sap/src/main/resources/bootstrap.yml b/op-modules/op-sap/src/main/resources/bootstrap.yml index 6981aeeab..14dae3167 100644 --- a/op-modules/op-sap/src/main/resources/bootstrap.yml +++ b/op-modules/op-sap/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: namespace: lanju-op - group: ywl + group: zxl # 服务注册地址 server-addr: 140.249.53.142:8848 config: namespace: lanju-op - group: ywl + group: zxl #命名空间 #group: local # 配置中心地址 diff --git a/op-modules/op-scada/src/main/resources/bootstrap.yml b/op-modules/op-scada/src/main/resources/bootstrap.yml index cb35ac633..7083f55f2 100644 --- a/op-modules/op-scada/src/main/resources/bootstrap.yml +++ b/op-modules/op-scada/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: namespace: lanju-op - group: ywl + group: zxl # 服务注册地址 server-addr: 140.249.53.142:8848 config: namespace: lanju-op - group: ywl + group: zxl #命名空间 #group: local # 配置中心地址 diff --git a/op-modules/op-security/src/main/resources/bootstrap.yml b/op-modules/op-security/src/main/resources/bootstrap.yml index 881ad2199..88ceff7db 100644 --- a/op-modules/op-security/src/main/resources/bootstrap.yml +++ b/op-modules/op-security/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: namespace: lanju-op - group: ywl + group: zxl # 服务注册地址 server-addr: 140.249.53.142:8848 config: namespace: lanju-op - group: ywl + group: zxl #命名空间 #group: local # 配置中心地址 diff --git a/op-modules/op-system/src/main/resources/bootstrap.yml b/op-modules/op-system/src/main/resources/bootstrap.yml index 58c6eeba3..fe34e4c4c 100644 --- a/op-modules/op-system/src/main/resources/bootstrap.yml +++ b/op-modules/op-system/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: namespace: lanju-op - group: ywl + group: zxl # 服务注册地址 server-addr: 140.249.53.142:8848 config: namespace: lanju-op - group: ywl + group: zxl #命名空间 #group: local # 配置中心地址 diff --git a/op-modules/op-technology/src/main/resources/bootstrap.yml b/op-modules/op-technology/src/main/resources/bootstrap.yml index 1a90cf036..e4200998f 100644 --- a/op-modules/op-technology/src/main/resources/bootstrap.yml +++ b/op-modules/op-technology/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: namespace: lanju-op - group: ywl + group: zxl # 服务注册地址 server-addr: 140.249.53.142:8848 config: namespace: lanju-op - group: ywl + group: zxl #命名空间 #group: local # 配置中心地址 diff --git a/op-modules/op-wms/src/main/resources/bootstrap.yml b/op-modules/op-wms/src/main/resources/bootstrap.yml index 6cb3e8303..01b12e10d 100644 --- a/op-modules/op-wms/src/main/resources/bootstrap.yml +++ b/op-modules/op-wms/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: namespace: lanju-op - group: ywl + group: zxl # 服务注册地址 server-addr: 140.249.53.142:8848 config: namespace: lanju-op - group: ywl + group: zxl #命名空间 #group: local # 配置中心地址