|
|
|
@ -125,16 +125,16 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
|
|
|
|
|
MesShippingOrderManagement finalBean = bean;
|
|
|
|
|
groupDetailList.forEach(k -> {
|
|
|
|
|
MesShippingOrderManagementDetail detail = new MesShippingOrderManagementDetail();
|
|
|
|
|
|
|
|
|
|
BeanUtils.copyProperties(k, detail, "id");
|
|
|
|
|
MesPart part = partService.getPartByPartNo(k.getPartNo(), k.getOrganizeCode());
|
|
|
|
|
detail.setPartName(part.getPartName());
|
|
|
|
|
detail.setCustPartNo(k.getCustomerPartNo());
|
|
|
|
|
detail.setPlanQty(1);
|
|
|
|
|
detail.setActualQty(1);
|
|
|
|
|
// detail.setActualQty(1);
|
|
|
|
|
detail.setShippingOrderNo(finalBean.getShippingOrderNo());
|
|
|
|
|
detail.setOrganizeCode(k.getOrganizeCode());
|
|
|
|
|
detail.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue());
|
|
|
|
|
BeanUtils.copyProperties(k, detail, "id");
|
|
|
|
|
|
|
|
|
|
ConvertBean.serviceModelInitialize(detail, AuthUtil.getSessionUser().getUserName());
|
|
|
|
|
detailInsertList.add(detail);
|
|
|
|
|
});
|
|
|
|
@ -281,7 +281,7 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
|
|
|
|
|
|
|
|
|
|
MesJisShipping jisShipping = new MesJisShipping();
|
|
|
|
|
BeanUtils.copyProperties(originBean, jisShipping, "id");
|
|
|
|
|
BeanUtils.copyProperties(k, jisShipping, "id");
|
|
|
|
|
BeanUtils.copyProperties(v.get(0), jisShipping, "id");
|
|
|
|
|
jisShipping.setFactoryCode(originBean.getOrganizeCode());
|
|
|
|
|
jisShipping.setCusCode(originBean.getCustCode());
|
|
|
|
|
jisShipping.setShippingTime(TimeTool.getNowTime(true));
|
|
|
|
@ -295,6 +295,7 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
|
|
|
|
|
jisShipping.setShippingOrderCode(originBean.getShippingOrderNo());
|
|
|
|
|
jisShipping.setVin(v.get(0).getVin());
|
|
|
|
|
jisShipping.setCarNo(v.get(0).getVin());
|
|
|
|
|
jisShipping.setPartNo(part.getPartNo());
|
|
|
|
|
if (!StringUtils.isEmpty(part)) {
|
|
|
|
|
jisShipping.setUnit(part.getUnit());
|
|
|
|
|
}
|
|
|
|
|