Merge pull request 'demand: TMS系统 - 运输管理 - 货物组批次编辑-批量移除后批量添加无法保存修复' (#151) from develop into master

Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/151

emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java

@@ -608,6 +608,11 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi
             // 对剩余数据调用checkSiteBatch
             if (CollectionUtil.isNotEmpty(remainingList)) {
                 for (EmisTmsSiteBatchDtl itemDtl : remainingList) {
+                    // 从历史数据中获取对应的id，用于更新操作
+                    EmisTmsSiteBatchDtl historyDtl = historyBatchDtlMap.get(itemDtl.getBillCode());
+                    if (historyDtl != null) {
+                        itemDtl.setId(historyDtl.getId());
+                    }
                     checkSiteBatch(emisTmsSiteBatch, itemDtl);
                     emisTmsSiteBatchDtlMapper.updateEmisTmsSiteBatchDtl(itemDtl);
                 }