Merge remote-tracking branch 'origin/master'

This commit is contained in:
Kelvin 2024-12-06 10:28:17 +08:00
commit 6df503cf41

View File

@ -248,10 +248,12 @@ public class WmsOutPlanServiceImpl implements IWmsOutPlanService {
hashMap.put("wmStorageAreaCode", wmsOutPlanDetail.getWmStorageAreaCode()); // 库位编码
hashMap.put("wmStorageAreaName", wmsOutPlanDetail.getWmStorageAreaName()); // 库位名称
hashMap.put("detailStatus", wmsOutPlanDetail.getDetailState()); // 明细状态
/* 来自台账明细 */
/* 来自物料 */
hashMap.put("itemId", mdItem.getItemId()); // 物料ID
hashMap.put("itemName", mdItem.getItemName()); // 物料名称
hashMap.put("itemCode", mdItem.getItemCode()); // 物料编码
/* 来自台账 */
hashMap.put("baseKnife", baseKnifeMapper.selectBaseKnifeByBaseKnifeId(nowWmsOutPlanDetailEntity.getBaseKnifeId()));
/* 实体 */
String outTime = null;
if (nowWmsOutPlanDetailEntity.getCreateTime() != null)