diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchaseclaimRequest/PurchaseclaimRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchaseclaimRequest/PurchaseclaimRequestDetailDO.java index 6b3d0997..f29fa9dd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchaseclaimRequest/PurchaseclaimRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchaseclaimRequest/PurchaseclaimRequestDetailDO.java @@ -1,12 +1,8 @@ package com.win.module.wms.dal.dataobject.purchaseclaimRequest; +import com.sun.xml.bind.v2.TODO; import lombok.*; -import java.util.*; import java.math.BigDecimal; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; import com.win.framework.mybatis.core.dataobject.BaseDO; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainService.java index cbb4931f..d4d827c8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainService.java @@ -8,6 +8,7 @@ import com.win.module.wms.controller.countPlan.vo.CountPlanMainCreateReqVO; import com.win.module.wms.controller.countPlan.vo.CountPlanMainExportReqVO; import com.win.module.wms.controller.countPlan.vo.CountPlanMainPageReqVO; import com.win.module.wms.controller.countPlan.vo.CountPlanMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.countPlan.CountPlanDetailDO; import com.win.module.wms.dal.dataobject.countPlan.CountPlanMainDO; import com.win.framework.common.pojo.PageResult; @@ -79,4 +80,12 @@ public interface CountPlanMainService { */ List getCountPlanMainList(CountPlanMainExportReqVO exportReqVO); + /** + * Plan----VCount + * 校验盘点计划 + * @author chenfang + * @param pnumber + * @return + */ + CountPlanDetailDO selectCountPlanExist(String pnumber); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java index ba0b99b3..f8907575 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java @@ -1,10 +1,14 @@ package com.win.module.wms.service.countPlan; +import cn.hutool.core.exceptions.UtilException; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.countPlan.vo.CountPlanMainCreateReqVO; import com.win.module.wms.controller.countPlan.vo.CountPlanMainExportReqVO; import com.win.module.wms.controller.countPlan.vo.CountPlanMainPageReqVO; import com.win.module.wms.controller.countPlan.vo.CountPlanMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.countPlan.CountPlanDetailDO; +import com.win.module.wms.dal.mysql.countPlan.CountPlanDetailMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -32,6 +36,9 @@ public class CountPlanMainServiceImpl implements CountPlanMainService { @Resource private CountPlanMainMapper countPlanMainMapper; + @Resource + private CountPlanDetailMapper countPlanDetailMapper; + @Override public Long createCountPlanMain(CountPlanMainCreateReqVO createReqVO) { // 插入 @@ -87,4 +94,28 @@ public class CountPlanMainServiceImpl implements CountPlanMainService { return countPlanMainMapper.selectList(exportReqVO); } + @Override + public CountPlanDetailDO selectCountPlanExist(String pnumber){ + QueryWrapper queryWrapperMain = new QueryWrapper(); + queryWrapperMain.eq("number",pnumber); + queryWrapperMain.eq("available","TRUE"); + CountPlanMainDO countPlanMainDO = countPlanMainMapper.selectOne(queryWrapperMain); + if(countPlanMainDO != null){ + if(!"ClOSE".equals(countPlanMainDO.getStatus())){ + QueryWrapper queryWrapperDetail = new QueryWrapper(); + queryWrapperDetail.eq("number",pnumber); + queryWrapperDetail.eq("available","TRUE"); + CountPlanDetailDO countPlanDetailDO = countPlanDetailMapper.selectOne(queryWrapperDetail); + if(countPlanDetailDO != null){ + return countPlanDetailDO; + }else { + throw new UtilException("盘点计划" + pnumber + "无效"); + } + }else { + throw new UtilException("盘点计划" + pnumber + "已关闭"); + } + }else { + throw new UtilException("盘点计划" + pnumber + "无效"); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java index 6586c739..e4fd2be8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java @@ -86,10 +86,9 @@ public interface CustomerreturnJobMainService { * @param pnumber 单据号 * @param psupplierCode 供应商代码 * @param pitemCode 物品代码 - * @param plineNumber 行号 * @return 采购订单子列表 */ - public PurchaseDetailDO productionDetailExist(String pnumber, String psupplierCode, String pitemCode, String ppoNumber,String poLine); + public PurchaseDetailDO productionDetailExist(String pnumber, String psupplierCode, String pitemCode,String poLine); /** * 校验销售订单明细 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java index 8ee9c761..f9587716 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java @@ -97,8 +97,8 @@ public class CustomerreturnJobMainServiceImpl implements CustomerreturnJobMainSe } //校验采购订单明细 @Override - public PurchaseDetailDO productionDetailExist(String pnumber, String psupplierCode, String pitemCode, String ppoNumber,String poLine) { - PurchaseDetailDO purchaseDetailDO = purchaseMainService.selectPurchaseDetailDoExist(pnumber, psupplierCode, pitemCode, ppoNumber,poLine); + public PurchaseDetailDO productionDetailExist(String pnumber, String psupplierCode, String pitemCode,String poLine) { + PurchaseDetailDO purchaseDetailDO = purchaseMainService.selectPurchaseDetailDoExist(pnumber, psupplierCode, pitemCode,poLine); return purchaseDetailDO; } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java index adf1632e..7a914209 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java @@ -87,10 +87,9 @@ public interface DeliverJobMainService { * @param pnumber 单据号 * @param psupplierCode 供应商代码 * @param pitemCode 物品代码 - * @param plineNumber 行号 * @return 采购订单子列表 */ - public PurchaseDetailDO productionDetailExist(String pnumber, String psupplierCode, String pitemCode, String ppoNumber,String poLine); + public PurchaseDetailDO productionDetailExist(String pnumber, String psupplierCode, String pitemCode,String poLine); /** * Order----VS * 校验销售订单明细 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java index 0c26bc1c..35810343 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java @@ -99,8 +99,8 @@ public class DeliverJobMainServiceImpl implements DeliverJobMainService { } //校验采购订单明细 @Override - public PurchaseDetailDO productionDetailExist(String pnumber, String psupplierCode, String pitemCode, String ppoNumber,String poLine) { - PurchaseDetailDO purchaseDetailDO = purchaseMainService.selectPurchaseDetailDoExist(pnumber, psupplierCode, pitemCode, ppoNumber,poLine); + public PurchaseDetailDO productionDetailExist(String pnumber, String psupplierCode, String pitemCode,String poLine) { + PurchaseDetailDO purchaseDetailDO = purchaseMainService.selectPurchaseDetailDoExist(pnumber, psupplierCode, pitemCode,poLine); return purchaseDetailDO; } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainService.java index b56fd1cd..37c08f82 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainService.java @@ -87,9 +87,8 @@ public interface PurchaseMainService { * @param pnumber 单据号 * @param psupplierCode 供应商代码 * @param pitemCode 物品代码 - * @param plineNumber 行号 * @return 采购订单子列表 */ - public PurchaseDetailDO selectPurchaseDetailDoExist(String pnumber, String psupplierCode, String pitemCode, String ppoNumber,String poLine); + public PurchaseDetailDO selectPurchaseDetailDoExist(String pnumber, String psupplierCode, String pitemCode,String poLine); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java index 2b325453..137a018c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java @@ -94,7 +94,7 @@ public class PurchaseMainServiceImpl implements PurchaseMainService { } //公共方法 校验采购订单明细 @Override - public PurchaseDetailDO selectPurchaseDetailDoExist(String pnumber, String psupplierCode, String pitemCode, String ppoNumber,String poLine) { + public PurchaseDetailDO selectPurchaseDetailDoExist(String pnumber, String psupplierCode, String pitemCode,String poLine) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("number",pnumber); queryWrapper.eq("supplier_code",psupplierCode); @@ -105,12 +105,12 @@ public class PurchaseMainServiceImpl implements PurchaseMainService { queryWrapper1.eq("master_id",purchaseMainDO.getId()); queryWrapper1.eq("number",pnumber); queryWrapper1.eq("po_line",poLine); - queryWrapper1.eq("po_number",ppoNumber); + queryWrapper1.eq("item_code",pitemCode); PurchaseDetailDO purchaseDetailDO = purchaseDetailMapper.selectOne(queryWrapper1); if(purchaseDetailDO != null && "TRUE".equals(purchaseDetailDO.getAvailable())){ return purchaseDetailDO; }else { - throw new UtilException( "采购订单明细:订单号" + ppoNumber + "、订单行" + poLine + "、零件号" + pitemCode + "、无效"); + throw new UtilException( "采购订单明细:订单号" + pnumber + "、订单行" + poLine + "、零件号" + pitemCode + "、无效"); } }else { throw new UtilException( "采购订单" + pnumber + "已经关闭"); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java index feefe5d0..46311dd2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java @@ -117,7 +117,7 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService { throw new UtilException( "要货计划" + pnubmer + "已经关闭"); } }else { - throw new UtilException( "要货计划" + pnubmer + "无效"); + throw new UtilException( "根据计划单号" + pnubmer + ",供应商代码" + psupplierCode + "未查找到要货计划"); } } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRequest/PurchaseclaimRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRequest/PurchaseclaimRequestMainServiceImpl.java index 330c0620..fbc7908d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRequest/PurchaseclaimRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRequest/PurchaseclaimRequestMainServiceImpl.java @@ -217,7 +217,7 @@ public class PurchaseclaimRequestMainServiceImpl implements PurchaseclaimRequest } try { PurchaseDetailDO purchaseDetailDO = purchaseMainService.selectPurchaseDetailDoExist(detailDO.getNumber(), createReqVO.getSupplierCode() - , detailDO.getItemCode(), detailDO.getPoNumber(), detailDO.getPoLine()); + , detailDO.getItemCode(), detailDO.getPoLine()); try { ifPlanQtyBigThanOrderQty(detailDO.getPoLine(), purchaseDetailDO.getShippedQty(), detailDO.getQty(), purchaseDetailDO.getOrderQty()); }catch (Exception ex){ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkMainService.java index 0dc1ae67..c562c130 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkMainService.java @@ -9,6 +9,7 @@ import com.win.module.wms.controller.work.vo.WorkMainExportReqVO; import com.win.module.wms.controller.work.vo.WorkMainPageReqVO; import com.win.module.wms.controller.work.vo.WorkMainUpdateReqVO; import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; +import com.win.module.wms.dal.dataobject.work.WorkDetailDO; import com.win.module.wms.dal.dataobject.work.WorkMainDO; import com.win.framework.common.pojo.PageResult; @@ -80,4 +81,13 @@ public interface WorkMainService { */ List getWorkMainList(WorkMainExportReqVO exportReqVO); + /** + * Order----VW + * 校验生产订单 + * @author chenfang + * @param pnumber + * @param pitemCode + * @return + */ + WorkDetailDO selectWorkExist(String pnumber,String pitemCode); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkMainServiceImpl.java index c75089ee..29a156e4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkMainServiceImpl.java @@ -1,11 +1,16 @@ package com.win.module.wms.service.work; +import cn.hutool.core.exceptions.UtilException; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.exception.ErrorCode; import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.work.vo.WorkMainCreateReqVO; import com.win.module.wms.controller.work.vo.WorkMainExportReqVO; import com.win.module.wms.controller.work.vo.WorkMainPageReqVO; import com.win.module.wms.controller.work.vo.WorkMainUpdateReqVO; import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; +import com.win.module.wms.dal.dataobject.work.WorkDetailDO; +import com.win.module.wms.dal.mysql.work.WorkDetailMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -33,6 +38,9 @@ public class WorkMainServiceImpl implements WorkMainService { @Resource private WorkMainMapper workMainMapper; + @Resource + private WorkDetailMapper workDetailMapper; + @Override public Long createWorkMain(WorkMainCreateReqVO createReqVO) { // 插入 @@ -89,4 +97,21 @@ public class WorkMainServiceImpl implements WorkMainService { return workMainMapper.selectList(exportReqVO); } + @Override + public WorkDetailDO selectWorkExist(String pnumber, String pitemCode){ + QueryWrapper queryWrapperMain = new QueryWrapper(); + queryWrapperMain.eq("number",pnumber); + queryWrapperMain.eq("available","TURE"); + WorkMainDO workMainDO = workMainMapper.selectOne(queryWrapperMain); + if(workMainDO != null){ + QueryWrapper queryWrapperDetail = new QueryWrapper(); + queryWrapperDetail.eq("item_code",pitemCode); + WorkDetailDO workDetailDO = workDetailMapper.selectOne(queryWrapperDetail); + if(workDetailDO != null){ + return workDetailDO; + }else { + throw new UtilException("生产订单明细:"+ pitemCode + "无效"); + } + }throw exception(WORK_MAIN_NOT_EXISTS); + } }