|
|
|
@ -307,8 +307,8 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
|
|
|
|
|
jisShipping.setCusCode(originBean.getCustCode());
|
|
|
|
|
jisShipping.setShippingTime(TimeTool.getNowTime(true));
|
|
|
|
|
jisShipping.setDock(originBean.getSendDockCode());
|
|
|
|
|
jisShipping.setErpWarerhouse(configService.getCfgValue(bean.getOrganizeCode(), "ERP_WARERHOUSE"));
|
|
|
|
|
jisShipping.setErpWarehous(mesPartShippingGroup == null || StringUtils.isEmpty(mesPartShippingGroup.getSrcWarerhouse()) ? configService.getCfgValue(bean.getOrganizeCode(), "ERP_WAREHOUS") : mesPartShippingGroup.getSrcWarerhouse());
|
|
|
|
|
jisShipping.setErpWarerhouse(mesPartShippingGroup == null || StringUtils.isEmpty(mesPartShippingGroup.getSrcWarerhouse()) ? configService.getCfgValue(bean.getOrganizeCode(), "ERP_WARERHOUSE") : mesPartShippingGroup.getSrcWarerhouse());
|
|
|
|
|
jisShipping.setErpWarehous(configService.getCfgValue(bean.getOrganizeCode(), "ERP_WAREHOUS"));
|
|
|
|
|
jisShipping.setCusDock(originBean.getCustDockCode());
|
|
|
|
|
jisShipping.setCustOrderNo(v.get(0).getCustOrderNo());
|
|
|
|
|
jisShipping.setSerialNumber(v.get(0).getBarcode());
|
|
|
|
|