diff --git a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/RemoteMesService.java b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/RemoteMesService.java index eb137526..53a8f1fd 100644 --- a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/RemoteMesService.java +++ b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/RemoteMesService.java @@ -39,6 +39,16 @@ public interface RemoteMesService { @PostMapping("/materialinfo/getMaterialsByMaterialIds") public R> getMaterialsByMaterialIds(@RequestBody MesBaseMaterialInfoVo mesBaseMaterialInfo, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + /** + * 通过物料ID查询物料信息 + * + * @param materialId + * @param source 请求来源 + * @return 结果 + */ + @PostMapping("/materialinfo/getMaterialByMaterialId") + public R getMaterialByMaterialId(@PathVariable("materialId") Long materialId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + /** * 查询工位信息列表 diff --git a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseMaterialInfo.java b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseMaterialInfo.java index aa53ffb2..32b15bf9 100644 --- a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseMaterialInfo.java +++ b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseMaterialInfo.java @@ -121,6 +121,9 @@ public class MesBaseMaterialInfo extends BaseEntity /**安全库存数量*/ private BigDecimal safeStockAmount; + /**申请标识(1是，0否)，代表是否需要申请才能出库*/ + private String applyFlag; + /** erp最后更新日期;对应FModifyDate */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "erp最后更新日期;对应FModifyDate", width = 30, dateFormat = "yyyy-MM-dd") @@ -374,6 +377,14 @@ public class MesBaseMaterialInfo extends BaseEntity this.safeStockAmount = safeStockAmount; } + public String getApplyFlag() { + return applyFlag; + } + + public void setApplyFlag(String applyFlag) { + this.applyFlag = applyFlag; + } + public void setErpModifyDate(Date erpModifyDate) { this.erpModifyDate = erpModifyDate; diff --git a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/factory/RemoteMesFallbackFactory.java b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/factory/RemoteMesFallbackFactory.java index 837de7ea..a7541082 100644 --- a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/factory/RemoteMesFallbackFactory.java +++ b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/factory/RemoteMesFallbackFactory.java @@ -35,6 +35,11 @@ public class RemoteMesFallbackFactory implements FallbackFactory> getMaterialsByMaterialIds(MesBaseMaterialInfoVo mesBaseMaterialInfo, String source) { + return R.fail("获取物料信息列表失败:" + throwable.getMessage()); + } + + @Override + public R getMaterialByMaterialId(Long materialId, String source) { return R.fail("获取物料信息失败:" + throwable.getMessage()); } diff --git a/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/MesConstants.java b/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/MesConstants.java index 33971a30..03c414b5 100644 --- a/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/MesConstants.java +++ b/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/MesConstants.java @@ -199,4 +199,16 @@ public class MesConstants { * 电脑或工控机显示派工标识(1是，0否)*/ public static final String MES_PROCESS_DISPLAY_FLAG_YES = "1";//是 + + /** + * 物料信息的申请标识 + */ + public static final String MES_MATERIAL_APPLY_FLAG_YES = "1";//是 + public static final String MES_MATERIAL_APPLY_FLAG_NO = "0";//否 + + /** + * 物料信息状态 + */ + public static final String MES_MATERIAL_ACTIVE_FLAG_NORMAL = "1";//正常 + public static final String MES_MATERIAL_ACTIVE_FLAG_STOP = "0";//停用 } diff --git a/hw-modules/hw-jindie/src/main/java/com/hw/jindie/enums/SyncMaterialInfoEnums.java b/hw-modules/hw-jindie/src/main/java/com/hw/jindie/enums/SyncMaterialInfoEnums.java index 831b6d27..7fd3394d 100644 --- a/hw-modules/hw-jindie/src/main/java/com/hw/jindie/enums/SyncMaterialInfoEnums.java +++ b/hw-modules/hw-jindie/src/main/java/com/hw/jindie/enums/SyncMaterialInfoEnums.java @@ -101,7 +101,7 @@ public enum SyncMaterialInfoEnums { public static void main(String[] args) { - System.out.println(fieldKeyList.toString().replaceAll("\\[","").replaceAll("]","")); +// System.out.println(fieldKeyList.toString().replaceAll("\\[","").replaceAll("]","")); for (SyncMaterialInfoEnums syncMaterialInfoEnums : SyncMaterialInfoEnums.values()) { // System.out.println(syncMaterialInfoEnums + " - " + syncMaterialInfoEnums.getDataType()); } diff --git a/hw-modules/hw-jindie/src/main/java/com/hw/jindie/service/impl/KingdeeErpService.java b/hw-modules/hw-jindie/src/main/java/com/hw/jindie/service/impl/KingdeeErpService.java index 240b9b0f..ad3ed867 100644 --- a/hw-modules/hw-jindie/src/main/java/com/hw/jindie/service/impl/KingdeeErpService.java +++ b/hw-modules/hw-jindie/src/main/java/com/hw/jindie/service/impl/KingdeeErpService.java @@ -303,7 +303,7 @@ public class KingdeeErpService { requestParams.put("Id", params.get("Id"));//单据内码集合 //调用接口 String audit = client.view(formId, requestParams.toJSONString()); - System.out.println(("genericAuditInterface|formId：" + formId + "|请求参数：" + requestParams.toJSONString() + "|返回结果：" + audit)); +// System.out.println(("genericAuditInterface|formId：" + formId + "|请求参数：" + requestParams.toJSONString() + "|返回结果：" + audit)); return audit; } @@ -364,7 +364,7 @@ public class KingdeeErpService { public String testAssemblyEntity(String params) { JSONObject model = new JSONObject(); String result = this.saveGenericAssemblyEntity(model); - System.out.println(result); +// System.out.println(result); return result; } @@ -382,7 +382,7 @@ public class KingdeeErpService { } //调用接口 String save = client.save(formId, params.toJSONString()); - System.out.println(("genericSaveInterface|formId：" + formId + "|请求参数：" + params.toJSONString() + "|返回结果：" + save)); +// System.out.println(("genericSaveInterface|formId：" + formId + "|请求参数：" + params.toJSONString() + "|返回结果：" + save)); return save; } diff --git a/hw-modules/hw-jindie/src/main/java/com/hw/jindie/service/impl/KingdeeErpSyncServiceImpl.java b/hw-modules/hw-jindie/src/main/java/com/hw/jindie/service/impl/KingdeeErpSyncServiceImpl.java index 6ab85907..fecd3c84 100644 --- a/hw-modules/hw-jindie/src/main/java/com/hw/jindie/service/impl/KingdeeErpSyncServiceImpl.java +++ b/hw-modules/hw-jindie/src/main/java/com/hw/jindie/service/impl/KingdeeErpSyncServiceImpl.java @@ -2,6 +2,7 @@ package com.hw.jindie.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.hw.common.core.constant.MesConstants; import com.hw.common.core.utils.DateUtils; import com.hw.common.core.utils.StringUtils; import com.hw.jindie.api.domain.vo.ErpSyncInfoVo; @@ -82,7 +83,7 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService { String filterString = "FModifyDate >'" + maxErpModifyDate + "'"; queryJson.put("FilterString", filterString); } - System.out.println(queryJson.toString()); +// System.out.println(queryJson.toString()); String result = api.billQuery(queryJson.toString()); if (StringUtils.isEmpty(result)) { @@ -151,7 +152,7 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService { } System.out.println("size:" + resultArray.size()); - System.out.println(resultArray); +// System.out.println(resultArray); //如果返回的数组的数量等于分页数量，则继续获取下一页数据 if (resultArray.size() == limit) { //通过递归同步所有供应商，测试先不用 @@ -420,6 +421,7 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService { mesBaseMaterialInfo.setMaterialId(existedMesBaseMaterialInfo.getMaterialId()); toUpdateMaterialInfoList.add(mesBaseMaterialInfo); } else { + mesBaseMaterialInfo.setActiveFlag(MesConstants.MES_MATERIAL_ACTIVE_FLAG_NORMAL); toInsertMaterialInfoList.add(mesBaseMaterialInfo); } } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseAttachInfoController.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseAttachInfoController.java index bfb371e7..99e2b31b 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseAttachInfoController.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseAttachInfoController.java @@ -3,8 +3,10 @@ package com.hw.mes.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.hw.common.core.constant.Constants; import com.hw.common.core.constant.MesConstants; import com.hw.common.core.domain.R; +import com.hw.common.core.exception.ServiceException; import com.hw.common.core.utils.StringUtils; import com.hw.common.core.utils.uuid.UUID; import com.hw.system.api.RemoteFileService; @@ -118,8 +120,11 @@ public class MesBaseAttachInfoController extends BaseController { } else { fileResult = remoteFileService.upload(file); } + if (fileResult.getCode() == Constants.FAIL) { + throw new ServiceException(fileResult.getMsg()); + } } catch (Exception e) { - return error("文件服务异常，请联系管理员"); + return error("文件服务异常，请联系管理员：" + e.getMessage()); } String url = fileResult.getData().getUrl(); String name = fileResult.getData().getName(); diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseMaterialInfoController.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseMaterialInfoController.java index 49950367..2a4b4ef2 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseMaterialInfoController.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseMaterialInfoController.java @@ -133,4 +133,15 @@ public class MesBaseMaterialInfoController extends BaseController } + + /** + * 获取物料信息详细信息 + */ + @InnerAuth + @GetMapping(value = "/getMaterialByMaterialId/materialId}") + public AjaxResult getMaterialByMaterialId(@PathVariable("materialId") Long materialId) + { + return success(mesBaseMaterialInfoService.selectMesBaseMaterialInfoByMaterialId(materialId)); + } + } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesMaterialBomController.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesMaterialBomController.java index 90ec4b6b..9a3cd795 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesMaterialBomController.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesMaterialBomController.java @@ -42,7 +42,7 @@ public class MesMaterialBomController extends BaseController @GetMapping("/list") public AjaxResult list(MesMaterialBom mesMaterialBom) { - List list = mesMaterialBomService.selectMesMaterialBomList(mesMaterialBom); + List list = mesMaterialBomService.selectMesMaterialBomJoinList(mesMaterialBom); return success(list); } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesProductPlan.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesProductPlan.java index 2d72067c..3c126adc 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesProductPlan.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesProductPlan.java @@ -120,23 +120,23 @@ public class MesProductPlan extends BaseEntity private BigDecimal completeAmount; /** 计划开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "计划开始时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "计划开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date planBeginTime; /** 计划结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "计划结束时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "计划结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date planEndTime; /** 开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date realBeginTime; /** 完成时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date realEndTime; /** 附件信息，关联附件信息主键;多个用,隔开；页面可选择附件信息，也可直接上传 */ diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/vo/MesProductPlanEditVo.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/vo/MesProductPlanEditVo.java index 1343fcf1..b1748932 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/vo/MesProductPlanEditVo.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/vo/MesProductPlanEditVo.java @@ -22,7 +22,7 @@ public class MesProductPlanEditVo { private Long productOrderId; //此次生产派工数量 - private BigDecimal dispatchAmount; + private int dispatchAmount; //保存的生产计划 @NotNull(message = "没有修改的生产派工提交") diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseMaterialInfoServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseMaterialInfoServiceImpl.java index 83ed832c..74788208 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseMaterialInfoServiceImpl.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseMaterialInfoServiceImpl.java @@ -12,6 +12,7 @@ import com.hw.mes.api.domain.MesBaseBarcodeInfo; import com.hw.mes.domain.MesOrderBind; import com.hw.mes.mapper.MesBaseBarcodeInfoMapper; import com.hw.mes.mapper.MesOrderBindMapper; +import org.apache.poi.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.hw.mes.mapper.MesBaseMaterialInfoMapper; @@ -55,7 +56,7 @@ public class MesBaseMaterialInfoServiceImpl implements IMesBaseMaterialInfoServi @Override public List selectMesBaseMaterialInfoList(MesBaseMaterialInfo mesBaseMaterialInfo) { mesBaseMaterialInfo.setMaterialSpec(StringUtils.isNotEmpty(mesBaseMaterialInfo.getMaterialSpec()) - ? mesBaseMaterialInfo.getMaterialSpec().replaceAll("\\s+", ""):""); + ? mesBaseMaterialInfo.getMaterialSpec().replaceAll("\\s+", "") : ""); return mesBaseMaterialInfoMapper.selectMesBaseMaterialInfoList(mesBaseMaterialInfo); } @@ -96,7 +97,8 @@ public class MesBaseMaterialInfoServiceImpl implements IMesBaseMaterialInfoServi mesBaseMaterialInfo.setUpdateTime(DateUtils.getNowDate()); mesBaseMaterialInfo.setUpdateBy(SecurityUtils.getUsername()); - if (!mesBaseMaterialInfo.getBatchFlag().equals(MesConstants.IS_BATCH)) { + if (StringUtils.isNotEmpty(mesBaseMaterialInfo.getBatchFlag()) + && !mesBaseMaterialInfo.getBatchFlag().equals(MesConstants.IS_BATCH)) { mesBaseMaterialInfo.setBatchAmount(BigDecimal.ONE); } return mesBaseMaterialInfoMapper.updateMesBaseMaterialInfo(mesBaseMaterialInfo); diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesMaterialBomServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesMaterialBomServiceImpl.java index df340ae5..bb29e411 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesMaterialBomServiceImpl.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesMaterialBomServiceImpl.java @@ -119,6 +119,8 @@ public class MesMaterialBomServiceImpl implements IMesMaterialBomService @Override public List selectMesMaterialBomJoinList(MesMaterialBom mesMaterialBom) { + mesMaterialBom.setMaterialSpec(StringUtils.isNotEmpty(mesMaterialBom.getMaterialSpec()) + ? mesMaterialBom.getMaterialSpec().replaceAll("\\s+", "") : ""); return mesMaterialBomMapper.selectMesMaterialBomJoinList(mesMaterialBom); } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductOrderServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductOrderServiceImpl.java index 82bc70a3..84251b98 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductOrderServiceImpl.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductOrderServiceImpl.java @@ -153,16 +153,16 @@ public class MesProductOrderServiceImpl implements IMesProductOrderService { * @param mesProductOrder */ private void checkSameProcessTimeClash(MesProductOrder mesProductOrder) { - HashMap map = new HashMap<>(); - map.put("planBeginTime", DateUtils.parseDateToStr(YYYY_MM_DD_HH_MM_SS, mesProductOrder.getPlanBeginTime())); - map.put("planEndTime", DateUtils.parseDateToStr(YYYY_MM_DD_HH_MM_SS, mesProductOrder.getPlanEndTime())); - MesProductOrder productOrder = new MesProductOrder(); - productOrder.setParams(map); - productOrder.setDispatchId(mesProductOrder.getDispatchId()); - List productOrderList = mesProductOrderMapper.selectMesProductOrderList(productOrder); - if (productOrderList.size() > 0) { - throw new ServiceException("此工艺路线的生产工单时间冲突"); - } +// HashMap map = new HashMap<>(); +// map.put("planBeginTime", DateUtils.parseDateToStr(YYYY_MM_DD_HH_MM_SS, mesProductOrder.getPlanBeginTime())); +// map.put("planEndTime", DateUtils.parseDateToStr(YYYY_MM_DD_HH_MM_SS, mesProductOrder.getPlanEndTime())); +// MesProductOrder productOrder = new MesProductOrder(); +// productOrder.setParams(map); +// productOrder.setDispatchId(mesProductOrder.getDispatchId()); +// List productOrderList = mesProductOrderMapper.selectMesProductOrderList(productOrder); +// if (productOrderList.size() > 0) { +// throw new ServiceException("此工艺路线的生产工单时间冲突"); +// } } /** diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductPlanServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductPlanServiceImpl.java index 74364889..524fb134 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductPlanServiceImpl.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductPlanServiceImpl.java @@ -285,7 +285,7 @@ public class MesProductPlanServiceImpl implements IMesProductPlanService { BigDecimal dispatchedAmount = mesProductOrder.getDispatchAmount() == null ? BigDecimal.ZERO : mesProductOrder.getDispatchAmount(); BigDecimal planAmount = mesProductOrder.getPlanAmount(); - BigDecimal updateDispatchAmount = dispatchedAmount.add(mesProductPlanEditVo.getDispatchAmount()); + BigDecimal updateDispatchAmount = dispatchedAmount.add(new BigDecimal(mesProductPlanEditVo.getDispatchAmount())); if (updateDispatchAmount.compareTo(planAmount) > 0) { throw new ServiceException("总派工数量不能大于计划数量，请重新派工"); } diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml index 7c4cf44c..c186e84b 100644 --- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml +++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml @@ -37,6 +37,7 @@ + @@ -67,6 +68,7 @@ bmi.prodline_id, bmi.active_flag, bmi.deleted_flag, + bmi.apply_flag, bmi.remark, bmi.create_by, bmi.create_time, diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesMaterialBomMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesMaterialBomMapper.xml index c4b5129a..5f2fb50a 100644 --- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesMaterialBomMapper.xml +++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesMaterialBomMapper.xml @@ -153,21 +153,44 @@ diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsRawOutstockServiceImpl.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsRawOutstockServiceImpl.java index 3fa8d177..cb64a673 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsRawOutstockServiceImpl.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsRawOutstockServiceImpl.java @@ -309,11 +309,11 @@ public class WmsRawOutstockServiceImpl implements IWmsRawOutstockService { R baseBarcodeInfoR = remoteMesService.getBarcode(materialBarcode, SecurityConstants.INNER); if (baseBarcodeInfoR == null) { - throw new ServiceException("物料编码有误"); + throw new ServiceException("物料条码有误"); } MesBaseBarcodeInfo baseBarcodeInfo = baseBarcodeInfoR.getData(); if (baseBarcodeInfo == null) { - throw new ServiceException("物料编码有误"); + throw new ServiceException("物料条码有误"); } String batchFlag = baseBarcodeInfo.getBatchFlag(); @@ -333,23 +333,7 @@ public class WmsRawOutstockServiceImpl implements IWmsRawOutstockService { if (rawOutstockId != null) { wmsRawOutstock = wmsRawOutstockMapper.selectWmsRawOutstockByRawOutstockId(rawOutstockId); } else { - WmsRawOutstock queryRawOutstock = new WmsRawOutstock(); - queryRawOutstock.setWarehouseId(baseLocation.getWarehouseId()); - queryRawOutstock.setMaterialId(baseBarcodeInfo.getMaterialId()); - queryRawOutstock.setExecuteStatusStr(WmsConstants.WMS_EXECUTE_STATUS_TOEXECUTE + "," + WmsConstants.WMS_EXECUTE_STATUS_EXECUTING); - queryRawOutstock.setAuditStatus(WmsConstants.WMS_AUDIT_STATUS_PASS); - queryRawOutstock.setRawOutstockId(rawOutstockId); - - List wmsRawOutstocks = wmsRawOutstockMapper.selectWmsRawOutstockList(queryRawOutstock); - if (wmsRawOutstocks == null || wmsRawOutstocks.isEmpty()) { - throw new ServiceException("无此出库任务"); - } - - if (wmsRawOutstocks.size() > 1) { - throw new ServiceException("请选择具体出库任务后点击确认"); - } - - wmsRawOutstock = wmsRawOutstocks.get(0); + wmsRawOutstock = this.getWmsRawOutstock(baseLocation,baseBarcodeInfo); } @@ -403,6 +387,28 @@ public class WmsRawOutstockServiceImpl implements IWmsRawOutstockService { return 1; } + public WmsRawOutstock getWmsRawOutstock(WmsBaseLocation baseLocation,MesBaseBarcodeInfo baseBarcodeInfo){ + WmsRawOutstock queryRawOutstock = new WmsRawOutstock(); + queryRawOutstock.setWarehouseId(baseLocation.getWarehouseId()); + queryRawOutstock.setMaterialId(baseBarcodeInfo.getMaterialId()); + queryRawOutstock.setExecuteStatusStr(WmsConstants.WMS_EXECUTE_STATUS_TOEXECUTE + "," + WmsConstants.WMS_EXECUTE_STATUS_EXECUTING); + queryRawOutstock.setAuditStatus(WmsConstants.WMS_AUDIT_STATUS_PASS); + + List wmsRawOutstocks = wmsRawOutstockMapper.selectWmsRawOutstockList(queryRawOutstock); + if (wmsRawOutstocks == null || wmsRawOutstocks.isEmpty()) { + throw new ServiceException("无此出库任务"); + } + + if (wmsRawOutstocks.size() > 1) { + throw new ServiceException("请选择具体出库任务后点击确认"); + } + + WmsRawOutstock wmsRawOutstock = wmsRawOutstocks.get(0); + + return wmsRawOutstock; + } + + public void insertRawOutstockDetail(WmsRawOutstock wmsRawOutstock, String locationCode, String materialBarcode, String batchCode, String userName, Date currentDate) { WmsRawOutstockDetail wmsRawOutstockDetail = new WmsRawOutstockDetail();