qiangxuan 1 місяць тому
батько
коміт
df847a9cb0

+ 5 - 0
zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/service/impl/StorageBillServiceImpl.java

@@ -1198,6 +1198,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                 .eq(BilletHotsend::getHeatNo, billetHotsend.getHeatNo())
                 .eq(BilletHotsend::getShift, billetHotsend.getShift())
                 .eq(BilletHotsend::getShiftGroup, billetHotsend.getShiftGroup());
+        log.info("{}{}", "热装炉次传递单对象信息:", JSON.toJSON(billetHotsend));
         BilletHotsend check = billetHotsendBaseMapper.selectOne(queryWrapper);
         if (oConvertUtils.isEmpty(check)){
             result.put("fail", "钢坯热送信息不存在,B端临时表同步操作失败!");
@@ -2818,12 +2819,14 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                  * 维护热送单炉信息 保存棒二或或棒三明细 更新钢坯基础信息
                  * 在这里可以添加更多针对每个分组(键和对应列表)的业务逻辑操作,比如遍历列表中的元素等
                  */
+                log.info("{}{}", "++++++编辑装运单热装:", rollClubCommonLists);
                 for (Map.Entry<String, List<RollClubCommon>> entry : rollClubCommonLists.entrySet()) {
                     String[] parts = entry.getKey().split(",");
                     billetHotsend.setHeatNo(parts[0]);// 炉号
                     billetHotsend.setShiftGroup(parts[1]);// 班组
                     billetHotsend.setShift(parts[2]);// 班别
                     List<RollClubCommon> groupRollClubCommonList = entry.getValue();
+                    billetHotsend.setCcmNo(storageBill.getCcmNo());
                     JSONObject jsonObject = commonBilletHotsenAndDetailsHandle(billetHotsend, billetHotsendDetailsVo, billetHotsendTypeConfig, storageBill, groupRollClubCommonList, null);
                     if (jsonObject.containsKey("fail")) {
                         log.info("{}{}", "编辑装运单,未知目的地数据同步操作失败,事务回滚!", jsonObject);
@@ -2892,12 +2895,14 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                     billetHotsend.setHeatNo(parts[0]);// 炉号
                     billetHotsend.setShiftGroup(parts[1]);// 班组
                     billetHotsend.setShift(parts[2]);// 班别
+                    billetHotsend.setCcmNo(storageBill.getCcmNo());
                     List<RollClubCommon> groupRollClubCommonList = entry.getValue();
                     LambdaQueryWrapper<BilletHotsend> queryWrapper = new LambdaQueryWrapper<>();
                     queryWrapper.eq(BilletHotsend::getCcmNo, billetHotsend.getCcmNo())
                             .eq(BilletHotsend::getHeatNo, billetHotsend.getHeatNo())
                             .eq(BilletHotsend::getShift,  billetHotsend.getShift())
                             .eq(BilletHotsend::getShiftGroup, billetHotsend.getShiftGroup());
+                    log.info("{}{}", "堆垛炉次传递单对象信息:", JSON.toJSON(billetHotsend));
                     BilletHotsend idExistBh = billetHotsendBaseMapper.selectOne(queryWrapper);
                     if (oConvertUtils.isEmpty(idExistBh)){
                         log.info("{}{}", "编辑装运单,钢坯热送单为空,堆垛数据同步失败:", JSON.toJSON(billetHotsend));