Merge branch 'master' of http://123.57.213.14:3001/zgzt/dosb-java

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

@@ -2826,7 +2826,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                     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);
@@ -2895,7 +2894,6 @@ 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())
@@ -3183,6 +3181,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                     billetHotsend.setHeatNo(parts[0]);// 炉号
                     billetHotsend.setShiftGroup(parts[1]);// 班组
                     billetHotsend.setShift(parts[2]);// 班别
+                    log.info("{}{}", "看板堆垛炉次传递单！", JSON.toJSON(billetHotsend));
                     List<RollClubCommon> groupRollClubCommonList = entry.getValue();
                     LambdaQueryWrapper<BilletHotsend> queryWrapper = new LambdaQueryWrapper<>();
                     queryWrapper.eq(BilletHotsend::getCcmNo, billetHotsend.getCcmNo())