jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity

修改装车单明细

Browse Source
tags/yfai-mes-ext-v1.0
LML丶 12 months ago
parent 64b565fc86
commit 3e4b2a5172
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File

10
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesLoadingListDetailDaoImpl.java
Unescape Escape View File

@ -37,8 +37,8 @@ public class MesLoadingListDetailDaoImpl implements IMesLoadingListDetailDao {
StringBuffer hql = new StringBuffer("select mll.order_code ,mll.cust_name ,mll.cust_organize_name ,mll.shipping_group_name , ");
hql.append(" mlld.status , mll.truck_no ,mll.weather , ms.shipping_code ,ms.start_scan_time ,ms.end_scan_time ,ms.status as shipStatus , ");
hql.append(" mlld.create_date_time , mll.create_user ,mll.modify_date_time , ms.modify_user , ");
hql.append(" mll.cust_code , mll.cust_organize_code ,mll.shipping_group_code , ms.shipping_group_name , ");
hql.append(" mll.truck_no , ms.start_scan_time ,ms.end_scan_time ");
hql.append(" mll.cust_code , mll.cust_organize_code ,mll.shipping_group_code , ");
hql.append(" ms.start_scan_time ,ms.end_scan_time ");
hql.append(" from mes_loading_list as mll");
hql.append(" inner join mes_loading_list_detail as mlld on mll.id = mlld.pid");
hql.append(" and mll.organize_code = mlld.organize_code and mll.is_deleted = mlld.is_deleted and mll.is_valid = mlld.is_valid ");
@ -95,10 +95,8 @@ public class MesLoadingListDetailDaoImpl implements IMesLoadingListDetailDao {
model.setCustCode(StringUtils.isEmpty(cells[15]) ? "" : String.valueOf(cells[15]));
model.setCustOrganizeCode(StringUtils.isEmpty(cells[16]) ? "" : String.valueOf(cells[16]));
model.setShippingGroupCode(StringUtils.isEmpty(cells[17]) ? "" : String.valueOf(cells[17]));
model.setShippingGroupName(StringUtils.isEmpty(cells[18]) ? "" : String.valueOf(cells[18]));
model.setTruckNo(StringUtils.isEmpty(cells[19]) ? "" : String.valueOf(cells[19]));
model.setStartScanTime(StringUtils.isEmpty(cells[20]) ? "" : String.valueOf(cells[20]));
model.setEndScanTime(StringUtils.isEmpty(cells[21]) ? "" : String.valueOf(cells[21]));
model.setStartScanTime(StringUtils.isEmpty(cells[18]) ? "" : String.valueOf(cells[18]));
model.setEndScanTime(StringUtils.isEmpty(cells[19]) ? "" : String.valueOf(cells[19]));
modelList.add(model);
}

2
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListService.java
Unescape Escape View File

@ -110,6 +110,8 @@ public class MesLoadingListService extends BaseMesService<MesLoadingList> implem
// genSerialNoModel.setPartNo(bean.getPartNo());
List<String> resultList = syncFuncService.syncSerialNo(genSerialNoModel, bean.getCreateUser(), bean.getOrganizeCode(), 1).getResultList();
bean.setPartShippingGroupCode(partShippingGroup.getShippingGroupCode());
bean.setShippingGroupName(partShippingGroup.getShippingGroupName());
bean.setStatus(MesExtEnumUtil.LOADING_DETAIL_ORDER_STATUS.CREATE.getValue());
bean.setOrderCode(resultList.get(0));
bean.setIsFirstInstall(partShippingGroup.getIsFirstInstall());

7
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java
Unescape Escape View File

@ -151,6 +151,7 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
bean.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue());
}
bean.setShippingGroupName(partShippingGroup.getShippingGroupName());
bean.setCustDockCode(customerDock.getCustDockCode());
bean.setPartShippingGroupId(partShippingGroup.getId());
bean.setShippingType(MesExtEnumUtil.SHIPPING_ORDER_TYPE.SORT_SHIPPING.getValue());
@ -285,7 +286,7 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
MesShippingOrderManagement originBean = baseRDao.getById(bean.getId());
DdlPackBean detailPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(originBean.getShippingCode(), "shippingCode", detailPackBean);
DdlPreparedPack.getNumEqualPack(originBean.getId(), "pid", detailPackBean);
List<MesShippingOrderManagementDetail> detailDeleteList = detailService.findAll(detailPackBean);
Map<String, List<MesShippingOrderManagementDetail>> detailMap = detailDeleteList.stream().collect(Collectors.groupingBy(k -> k.getPartNo()));
@ -346,7 +347,7 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
MesShippingOrderManagement originBean = baseRDao.getById(bean.getId());
DdlPackBean detailPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
DdlPreparedPack.getNumEqualPack(originBean.getId(), "shippingId", detailPackBean);
DdlPreparedPack.getNumEqualPack(originBean.getId(), "pid", detailPackBean);
List<MesShippingOrderManagementDetail> detailDeleteList = detailService.findAll(detailPackBean);
originBean.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.CLOSE.getValue());
@ -354,7 +355,7 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
//修改当前发运单明细状态
detailDeleteList.forEach(k -> {
k.setActualQty(0);
k.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.CLOSE.getValue());
k.setStatus(MesExtEnumUtil.SHIPPING_ORDER_DETAIL_SHIPPING_STATUS.PUBLISHED.getValue());
ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName());
//若扫描过的条码 则恢复条码

Write Preview
Loading…
Cancel
Save