#
yxFwq
2024-07-19 577ba7f365c4dcb94053618681280150086d3c17
#
2个文件已修改
19 ■■■■ 已修改文件
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -4958,6 +4958,17 @@
                                if (basJarMastList.size()!=integer){
                                    log.error("{}号硫化罐硫化完成后开门完成修改硫化档案状态结果数量不一致!!!查询资料数量={},更新返回数量={}",jarMastByWrkNo.getJarId(),basJarMastList.size(),integer);
                                }
                            } else if (wrkMastExecute.getIoType()==2 && jarMastByWrkNo.getStatus()==5){
                                List<BasJarMast> basJarMastList = basJarMastService.getJarMastByJarIdAndStatusList(jarMastByWrkNo.getJarId(), new ArrayList<Integer>() {{
                                    add(4);//硫化完成
                                }});
                                if (basJarMastList.isEmpty()){
                                    continue;
                                }
                                Integer integer = basJarMastService.updateStatus(jarMastByWrkNo.getJarId(), 4, 5);
                                if (basJarMastList.size()!=integer){
                                    log.error("{}号硫化罐硫化完成后开门完成修改硫化档案状态结果数量不一致!!!查询资料数量={},更新返回数量={}",jarMastByWrkNo.getJarId(),basJarMastList.size(),integer);
                                }
                            } else {
                                if (!basJarMastService.updateById(jarMastByWrkNo)){
                                    log.error("硫化区域分段任务完成异常,BasJarMast={},异常信息={}",JSON.toJSONString(jarMastByWrkNo),"更新basJarMast失败");
src/main/resources/application.yml
@@ -671,24 +671,24 @@
    # 磅秤
  scale[0]:
    id: 1
    ip: 10.10.10.211
    ip: 10.10.10.206
    port: 5005
    staNo: 281
  # 磅秤
  scale[1]:
    id: 2
    ip: 10.10.10.212
    ip: 10.10.10.207
    port: 5005
    staNo: 292
  # 磅秤
  scale[2]:
    id: 3
    ip: 10.10.10.213
    ip: 10.10.10.208
    port: 5005
    staNo: 453
  # 磅秤
  scale[3]:
    id: 4
    ip: 10.10.10.214
    ip: 10.10.10.209
    port: 5005
    staNo: 460