Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

计划bug修改

Browse Source
highway
zhaoxiaolin 1 year ago
parent 6b9ccbd5c3
commit 76036ee69a
20 changed files with 36 additions and 71 deletions
Show Stats Download Patch File Download Diff File

6
op-auth/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -15,14 +15,14 @@ spring:
# username: nacos # username: nacos
# password: sfnacos2023 # 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 namespace: lanju-op
group: ywl group: zxl
server-addr: 140.249.53.142:8848 server-addr: 140.249.53.142:8848
config: config:
#命名空间 #命名空间
namespace: lanju-op namespace: lanju-op
group: ywl group: zxl
# 配置中心地址 # 配置中心地址
server-addr: 140.249.53.142:8848 server-addr: 140.249.53.142:8848
# 配置文件格式 # 配置文件格式

4
op-gateway/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -17,13 +17,13 @@ spring:
# password: sfnacos2023 # password: sfnacos2023
# namespace: lanju-op # namespace: lanju-op
namespace: lanju-op namespace: lanju-op
group: ywl group: zxl
# 服务注册地址 # 服务注册地址
server-addr: 140.249.53.142:8848 server-addr: 140.249.53.142:8848
config: config:
#命名空间 #命名空间
namespace: lanju-op namespace: lanju-op
group: ywl group: zxl
# 配置中心地址 # 配置中心地址
server-addr: 140.249.53.142:8848 server-addr: 140.249.53.142:8848
# 配置文件格式 # 配置文件格式

4
op-modules/op-device/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -14,12 +14,12 @@ spring:
nacos: nacos:
discovery: discovery:
namespace: lanju-op namespace: lanju-op
group: ywl group: zxl
# 服务注册地址 # 服务注册地址
server-addr: 140.249.53.142:8848 server-addr: 140.249.53.142:8848
config: config:
namespace: lanju-op namespace: lanju-op
group: ywl group: zxl
#命名空间 #命名空间
#group: local #group: local
# 配置中心地址 # 配置中心地址

4
op-modules/op-energy/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -14,12 +14,12 @@ spring:
nacos: nacos:
discovery: discovery:
namespace: lanju-op namespace: lanju-op
group: ywl group: zxl
# 服务注册地址 # 服务注册地址
server-addr: 140.249.53.142:8848 server-addr: 140.249.53.142:8848
config: config:
namespace: lanju-op namespace: lanju-op
group: ywl group: zxl
#命名空间 #命名空间
#group: local #group: local
# 配置中心地址 # 配置中心地址

4
op-modules/op-file/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -15,13 +15,13 @@ spring:
discovery: discovery:
# 服务注册地址 # 服务注册地址
namespace: lanju-op namespace: lanju-op
group: ywl group: zxl
# 服务注册地址 # 服务注册地址
server-addr: 140.249.53.142:8848 server-addr: 140.249.53.142:8848
config: config:
# 配置中心地址 # 配置中心地址
namespace: lanju-op namespace: lanju-op
group: ywl group: zxl
# 服务注册地址 # 服务注册地址
server-addr: 140.249.53.142:8848 server-addr: 140.249.53.142:8848
# 配置文件格式 # 配置文件格式

4
op-modules/op-gen/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -14,13 +14,13 @@ spring:
nacos: nacos:
discovery: discovery:
namespace: lanju-op namespace: lanju-op
group: ywl group: zxl
# 服务注册地址 # 服务注册地址
server-addr: 140.249.53.142:8848 server-addr: 140.249.53.142:8848
config: config:
#命名空间 #命名空间
namespace: lanju-op namespace: lanju-op
group: ywl group: zxl
# 配置中心地址 # 配置中心地址
server-addr: 140.249.53.142:8848 server-addr: 140.249.53.142:8848
# 配置文件格式 # 配置文件格式

4
op-modules/op-job/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -14,12 +14,12 @@ spring:
nacos: nacos:
discovery: discovery:
namespace: lanju-op namespace: lanju-op
group: ywl group: zxl
# 服务注册地址 # 服务注册地址
server-addr: 140.249.53.142:8848 server-addr: 140.249.53.142:8848
config: config:
namespace: lanju-op namespace: lanju-op
group: ywl group: zxl
#命名空间 #命名空间
#group: local #group: local
# 配置中心地址 # 配置中心地址

4
op-modules/op-mes/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -14,12 +14,12 @@ spring:
nacos: nacos:
discovery: discovery:
namespace: lanju-op namespace: lanju-op
group: ywl group: zxl
# 服务注册地址 # 服务注册地址
server-addr: 140.249.53.142:8848 server-addr: 140.249.53.142:8848
config: config:
namespace: lanju-op namespace: lanju-op
group: ywl group: zxl
#命名空间 #命名空间
#group: local #group: local
# 配置中心地址 # 配置中心地址

34
op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java
Unescape Escape View File

@ -167,12 +167,10 @@ public class ProOrderWorkorderController extends BaseController {
ArrayList<String> strings = new ArrayList<>(); ArrayList<String> strings = new ArrayList<>();
for (ProOrderWorkorder proOrderWorkorder : proOrderWorkorders) { for (ProOrderWorkorder proOrderWorkorder : proOrderWorkorders) {
String status = proOrderWorkorder.getStatus(); String status = proOrderWorkorder.getStatus();
// strings.add(status);
// 更新代码逻辑-wws
if (status.equals("w0")){ if (status.equals("w0")){
strings.add(proOrderWorkorder.getWorkorderId()); strings.add(proOrderWorkorder.getWorkorderId());
} else { } else {
throw new ServiceException("工单已经下单，不能删除！"); throw new ServiceException("工单已经下发，不能删除！");
} }
// 判断是否含有湿料计划 boolean值（存在为true，不存在为false） // 判断是否含有湿料计划 boolean值（存在为true，不存在为false）
if (proWetMaterialPlanDetailService.selectProWetMaterialPlanDetailByWorkId(proOrderWorkorder.getWorkorderId())) { if (proWetMaterialPlanDetailService.selectProWetMaterialPlanDetailByWorkId(proOrderWorkorder.getWorkorderId())) {
@ -180,36 +178,6 @@ public class ProOrderWorkorderController extends BaseController {
} }
} }
String[] orderWorkerIds= strings.toArray(new String[0]); 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)); return toAjax(proOrderWorkorderService.deleteProOrderWorkorderByWorkorderIds(orderWorkerIds));
} }

4
op-modules/op-plan/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -14,12 +14,12 @@ spring:
nacos: nacos:
discovery: discovery:
namespace: lanju-op namespace: lanju-op
group: ywl group: zxl
# 服务注册地址 # 服务注册地址
server-addr: 140.249.53.142:8848 server-addr: 140.249.53.142:8848
config: config:
namespace: lanju-op namespace: lanju-op
group: ywl group: zxl
#命名空间 #命名空间
#group: local #group: local
# 配置中心地址 # 配置中心地址

3
op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderBatchMapper.xml
Unescape Escape View File

@ -132,12 +132,9 @@
<delete id="deleteProOrderWorkorderBatchByWorkorderIds" parameterType="String"> <delete id="deleteProOrderWorkorderBatchByWorkorderIds" parameterType="String">
delete from pro_order_workorder_batch where workorder_id in delete from pro_order_workorder_batch where workorder_id in
(
select workorder_id from pro_order_workorder where order_id in
<foreach item="workorderId" collection="array" open="(" separator="," close=")"> <foreach item="workorderId" collection="array" open="(" separator="," close=")">
#{workorderId} #{workorderId}
</foreach> </foreach>
)
</delete> </delete>
</mapper> </mapper>

2
op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
Unescape Escape View File

@ -387,7 +387,7 @@
</delete> </delete>
<delete id="deleteProOrderWorkorderByWorkorderIds" parameterType="String"> <delete id="deleteProOrderWorkorderByWorkorderIds" parameterType="String">
delete from pro_order_workorder where order_id in delete from pro_order_workorder where workorder_id in
<foreach item="workorderId" collection="array" open="(" separator="," close=")"> <foreach item="workorderId" collection="array" open="(" separator="," close=")">
#{workorderId} #{workorderId}
</foreach> </foreach>

2
op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java
Unescape Escape View File

@ -25,7 +25,7 @@ public class QuaController {
@PostMapping("/saveQcProCheck") @PostMapping("/saveQcProCheck")
public R<Boolean> saveQcProCheck(@RequestBody QcProCheck qcProCheck) { public R<Boolean> saveQcProCheck(@RequestBody QcProCheck qcProCheck) {
qcProCheckService.saveQcProCheck(qcProCheck); //qcProCheckService.saveQcProCheck(qcProCheck);
if (qcProCheck.getIsqua()=="1") { if (qcProCheck.getIsqua()=="1") {
WCSDTO wcsdto = new WCSDTO(); WCSDTO wcsdto = new WCSDTO();
wcsdto.setFactory(qcProCheck.getFactoryCode()); wcsdto.setFactory(qcProCheck.getFactoryCode());

4
op-modules/op-quality/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -14,12 +14,12 @@ spring:
nacos: nacos:
discovery: discovery:
namespace: lanju-op namespace: lanju-op
group: ywl group: zxl
# 服务注册地址 # 服务注册地址
server-addr: 140.249.53.142:8848 server-addr: 140.249.53.142:8848
config: config:
namespace: lanju-op namespace: lanju-op
group: ywl group: zxl
#命名空间 #命名空间
#group: local #group: local
# 配置中心地址 # 配置中心地址

4
op-modules/op-sap/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -14,12 +14,12 @@ spring:
nacos: nacos:
discovery: discovery:
namespace: lanju-op namespace: lanju-op
group: ywl group: zxl
# 服务注册地址 # 服务注册地址
server-addr: 140.249.53.142:8848 server-addr: 140.249.53.142:8848
config: config:
namespace: lanju-op namespace: lanju-op
group: ywl group: zxl
#命名空间 #命名空间
#group: local #group: local
# 配置中心地址 # 配置中心地址

4
op-modules/op-scada/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -14,12 +14,12 @@ spring:
nacos: nacos:
discovery: discovery:
namespace: lanju-op namespace: lanju-op
group: ywl group: zxl
# 服务注册地址 # 服务注册地址
server-addr: 140.249.53.142:8848 server-addr: 140.249.53.142:8848
config: config:
namespace: lanju-op namespace: lanju-op
group: ywl group: zxl
#命名空间 #命名空间
#group: local #group: local
# 配置中心地址 # 配置中心地址

4
op-modules/op-security/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -14,12 +14,12 @@ spring:
nacos: nacos:
discovery: discovery:
namespace: lanju-op namespace: lanju-op
group: ywl group: zxl
# 服务注册地址 # 服务注册地址
server-addr: 140.249.53.142:8848 server-addr: 140.249.53.142:8848
config: config:
namespace: lanju-op namespace: lanju-op
group: ywl group: zxl
#命名空间 #命名空间
#group: local #group: local
# 配置中心地址 # 配置中心地址

4
op-modules/op-system/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -14,12 +14,12 @@ spring:
nacos: nacos:
discovery: discovery:
namespace: lanju-op namespace: lanju-op
group: ywl group: zxl
# 服务注册地址 # 服务注册地址
server-addr: 140.249.53.142:8848 server-addr: 140.249.53.142:8848
config: config:
namespace: lanju-op namespace: lanju-op
group: ywl group: zxl
#命名空间 #命名空间
#group: local #group: local
# 配置中心地址 # 配置中心地址

4
op-modules/op-technology/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -14,12 +14,12 @@ spring:
nacos: nacos:
discovery: discovery:
namespace: lanju-op namespace: lanju-op
group: ywl group: zxl
# 服务注册地址 # 服务注册地址
server-addr: 140.249.53.142:8848 server-addr: 140.249.53.142:8848
config: config:
namespace: lanju-op namespace: lanju-op
group: ywl group: zxl
#命名空间 #命名空间
#group: local #group: local
# 配置中心地址 # 配置中心地址

4
op-modules/op-wms/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -14,12 +14,12 @@ spring:
nacos: nacos:
discovery: discovery:
namespace: lanju-op namespace: lanju-op
group: ywl group: zxl
# 服务注册地址 # 服务注册地址
server-addr: 140.249.53.142:8848 server-addr: 140.249.53.142:8848
config: config:
namespace: lanju-op namespace: lanju-op
group: ywl group: zxl
#命名空间 #命名空间
#group: local #group: local
# 配置中心地址 # 配置中心地址

Write Preview
Loading…
Cancel
Save