Yangwl
/
mesnac_mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

库存回车

Browse Source
master
philip 4 years ago
parent d56ace6c93
commit 555f197712
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File

2
common/src/main/java/com/foreverwin/mesnac/common/constant/IntegrationTypeConstant.java
Unescape Escape View File

@ -15,4 +15,6 @@ public class IntegrationTypeConstant {
public static final String DIS_ROUTER = "DIS_ROUTER";
public static final String SHOP_ORDER = "SHOP_ORDER";
public static final String ITEM_BATCH_RECEIVE = "ITEM_BATCH_RECEIVE";
public static final String REPORT_ORDER = "REPORT_ORDER";
}

2
meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/InventoryController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.foreverwin.mesnac.meapi.controller;
import com.foreverwin.modular.core.util.CommonMethods;
import com.foreverwin.modular.core.util.R;
import com.foreverwin.modular.core.util.FrontPage;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -48,6 +49,7 @@ public class InventoryController {
public R getInventoryList(Inventory inventory){
List<Inventory> result;
QueryWrapper<Inventory> queryWrapper = new QueryWrapper<>();
inventory.setSite(CommonMethods.getSite());
queryWrapper.setEntity(inventory);
result = inventoryService.list(queryWrapper);
return R.ok(result);

3
production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java
Unescape Escape View File

@ -223,7 +223,6 @@ public class PodTemplateServiceImpl implements PodTemplateService {
QueryWrapper<InspectionTask> queryWrapper=new QueryWrapper<>();
queryWrapper.eq(InspectionTask.CATEGORY,Constants.INSPECTION_TYPE_P);
queryWrapper.eq(InspectionTask.SFC,sfc);
queryWrapper.ne(InspectionTask.STATUS,Constants.INSPECTION_TASK_STATUS_COMPLETE);
queryWrapper.ne(InspectionTask.RESULT,Constants.RSESULT_OK);
List<InspectionTask> list = inspectionTaskService.list(queryWrapper);
if (!list.isEmpty()) {
@ -489,7 +488,7 @@ public class PodTemplateServiceImpl implements PodTemplateService {
IntegrationLog log = new IntegrationLog();
log.setHandle(UUID.randomUUID().toString());
log.setSite(CommonMethods.getSite());
log.setIntegrationType(IntegrationTypeConstant.ROUTER);
log.setIntegrationType(IntegrationTypeConstant.REPORT_ORDER);
log.setCategory("REQUEST");
log.setIntegrationWay("ERP");
log.setIntegrationMethod("erpWebService.zmesProdordconf");

4
production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java
Unescape Escape View File

@ -143,7 +143,7 @@ public class SplitSfcServiceImpl extends ServiceImpl<SplitSfcMapper, SplitSfc> i
save(splitSfc);
String workCenterBo = shopOrderService.getById(HandleEnum.SHOP_ORDER.getHandle(site, sfcData.getShopOrder())).getPlannedWorkCenterBo();
Router routerBySfcBo = routerService.getRouterBySfcBo(HandleEnum.SFC.getHandle(site, sfc));
sfcDispatchCommonService.saveSfcDispatch(site,CommonMethods.getUser(),StringUtil.trimHandle(workCenterBo),sfc, sfcData.getShopOrder(),routerBySfcBo.getHandle());
sfcDispatchCommonService.saveSfcDispatch(site,CommonMethods.getUser(),StringUtil.trimHandle(workCenterBo),newSfc, sfcData.getShopOrder(),routerBySfcBo.getHandle());
return splitSfc;
} catch (Exception e) {
ExceptionUtil.throwException(e);
@ -236,7 +236,7 @@ public class SplitSfcServiceImpl extends ServiceImpl<SplitSfcMapper, SplitSfc> i
splitSfc.setCreatedDateTime(LocalDateTime.now());
save(splitSfc);
String workCenterBo = shopOrderService.getById(HandleEnum.SHOP_ORDER.getHandle(site, sfcData.getShopOrder())).getPlannedWorkCenterBo();
sfcDispatchCommonService.saveSfcDispatch(site,CommonMethods.getUser(),StringUtil.trimHandle(workCenterBo),sfc, sfcData.getShopOrder(),routerBo);
sfcDispatchCommonService.saveSfcDispatch(site,CommonMethods.getUser(),StringUtil.trimHandle(workCenterBo),newSfc, sfcData.getShopOrder(),routerBo);
return splitSfc;
} catch (Exception e) {
ExceptionUtil.throwException(e);

Write Preview
Loading…
Cancel
Save