diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java index d7239a5..0a31cf4 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java @@ -303,37 +303,6 @@ public class MesShippingOrderManagementService extends BaseMesService { -// -// DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode()); -// DdlPreparedPack.getStringEqualPack(k.getPartNo(), "partNo", packBean); -// MesPart part = partRepository.getByProperty(packBean); -// -// MesJisShipping jisShipping = new MesJisShipping(); -// BeanUtils.copyProperties(originBean, jisShipping, "id"); -// BeanUtils.copyProperties(k, jisShipping, "id"); -// jisShipping.setFactoryCode(originBean.getOrganizeCode()); -// jisShipping.setCusCode(originBean.getCustCode()); -// jisShipping.setShippingTime(TimeTool.getNowTime(true)); -// jisShipping.setDock(originBean.getSendDockCode()); -// jisShipping.setErpWarerhouse(configService.getCfgValue(bean.getOrganizeCode(), "ERP_WARERHOUSE")); -// jisShipping.setErpWarehous(configService.getCfgValue(bean.getOrganizeCode(), "ERP_WAREHOUS")); -// jisShipping.setCusDock(originBean.getCustDockCode()); -// jisShipping.setCustOrderNo(k.getCustOrderNo()); -// jisShipping.setSerialNumber(k.getBarcode()); -// jisShipping.setQuantityPerCar(detailDeleteList.size()); -// jisShipping.setShippingOrderCode(originBean.getShippingOrderNo()); -// jisShipping.setVin(k.getVin()); -// jisShipping.setCarNo(k.getVin()); -// if(!StringUtils.isEmpty(part)){ -// jisShipping.setUnit(part.getUnit()); -// } -// jisShipping.setOffTime(TimeTool.getNowTime(true)); -// ConvertBean.serviceModelInitialize(jisShipping, AuthUtil.getSessionUser().getUserName()); -// jisShippingList.add(jisShipping); -// }); - //修改当前发运单状态 originBean.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPED.getValue());