diff --git a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java index 0d004fa8..0d1917ea 100644 --- a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java +++ b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java @@ -733,7 +733,7 @@ public interface ErrorCodeConstants { ErrorCode SALE_DETAIL_NOT_EXISTS = new ErrorCode(1_000_117_001, "销售订单子不存在"); //发货计划ErrorCode ErrorCode DELIVERPLAN_MAIN_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_020_015, "导入发货计划不能为空"); - ErrorCode DELIVER_PLAN_MAIN_NOT_EXISTS = new ErrorCode(1_000_118_000, "发货计划主不存在"); + ErrorCode DELIVER_PLAN_MAIN_NOT_EXISTS = new ErrorCode(1_000_118_000, "发货计划不存在"); ErrorCode DELIVER_PLAN_DETAIL_NOT_EXISTS = new ErrorCode(1_000_118_001, "发货计划子不存在"); ErrorCode DELIVER_PLAN_STATUS_NOT_NEW = new ErrorCode(1_000_118_002, "发货计划不是新增状态"); ErrorCode DELIVER_PLAN_REQUEST_EXISTS = new ErrorCode(1_000_118_003, "发货计划存在成品发货申请"); @@ -799,6 +799,12 @@ public interface ErrorCodeConstants { //客户结算申请ErrorCode ErrorCode CUSTOMERSETTLE_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_127_000, "客户结算申请主不存在"); ErrorCode CUSTOMERSETTLE_REQUEST_DETAIL_NOT_EXISTS = new ErrorCode(1_000_127_001, "客户结算申请子不存在"); + ErrorCode CUSTOMERSETTLE_REQUEST_CANNOT_CLOSE = new ErrorCode(1_000__127_002, "客户结算申请状态不支持关闭"); + ErrorCode CUSTOMERSETTLE_REQUEST_CANNOT_SUBMIT = new ErrorCode(1_000_127_003, "客户结算申请状态不支持提交"); + ErrorCode CUSTOMERSETTLE_REQUEST_CANNOT_AGREE = new ErrorCode(1_000_127_004, "客户结算申请状态不支持审批同意"); + ErrorCode CUSTOMERSETTLE_REQUEST_CANNOT_HANDLE = new ErrorCode(1_000_127_005, "客户结算申请状态不支持处理"); + ErrorCode CUSTOMERSETTLE_REQUEST_CANNOT_ABORT = new ErrorCode(1_000_127_006, "客户结算申请状态不支持审批拒绝"); + ErrorCode CUSTOMERSETTLE_REQUEST_CANNOT_RE_ADD = new ErrorCode(1_000_127_007, "客户结算申请状态不支持重新添加"); ErrorCode CUSTOMERSETTLE_REQUEST_NOT_EXISTS = new ErrorCode(1_000_127_001, "客户结算申请不存在"); //客户结算记录ErrorCode diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanMainController.java index af1b4ad1..793686fb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanMainController.java @@ -205,12 +205,12 @@ public class DeliverPlanMainController { String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(12, available); String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); - mapDropDown.put(21, uom); - mapDropDown.put(22, available); + mapDropDown.put(19, uom); + mapDropDown.put(20, available); List resultList = new ArrayList<>(); // 导出 for(DeliverPlanMainDO mainDO : list) { - List subList = deliverPlanDetailService.selectListByID(mainDO.getId()); + List subList = deliverPlanDetailService.selectListByMasterID(mainDO.getId()); for(DeliverPlanDetailDO detailDO : subList) { DeliverPlanMainExcelVO vo = DeliverPlanMainConvert.INSTANCE.convert(mainDO, detailDO); vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); @@ -232,7 +232,8 @@ public class DeliverPlanMainController { String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(12, available); String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); - mapDropDown.put(12, uom); + mapDropDown.put(19, uom); + mapDropDown.put(20, available); // 输出 ExcelUtils.write(response, "发货计划信息导入模板.xlsx", "发货计划信息列表", DeliverPlanMainImportVO.class, list, mapDropDown); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailBaseVO.java index db5359cb..493990cd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailBaseVO.java @@ -68,4 +68,7 @@ public class DeliverPlanDetailBaseVO { @Schema(description = "是否可用") private String available; + @Schema(description = "主表id") + private Long masterId; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailExportReqVO.java index 96cc7c69..068d5234 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailExportReqVO.java @@ -62,4 +62,7 @@ public class DeliverPlanDetailExportReqVO { @Schema(description = "是否可用") private String available; + @Schema(description = "主表id") + private String masterId; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailPageReqVO.java index 4dadeba3..92c5ff85 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailPageReqVO.java @@ -64,4 +64,7 @@ public class DeliverPlanDetailPageReqVO extends PageParam { @Schema(description = "是否可用") private String available; + @Schema(description = "主表id") + private String masterId; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanMainExcelVO.java index 82e2c3fb..379146e1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanMainExcelVO.java @@ -73,11 +73,11 @@ public class DeliverPlanMainExcelVO { private String available; //子表导出字段 - @ExcelProperty("销售订单号") - private String soNumber; - - @ExcelProperty("销售订单行") - private String soLine; +// @ExcelProperty("销售订单号") +// private String soNumber; +// +// @ExcelProperty("销售订单行") +// private String soLine; @ExcelProperty("客户月台") private String customerDockCode; @@ -102,7 +102,8 @@ public class DeliverPlanMainExcelVO { @DictFormat("uom") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String uom; - @ExcelProperty("是否可用") + @ExcelProperty(value = "是否可用", converter = DictConvert.class) + @DictFormat("true_false") private String availableDetail; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanMainImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanMainImportVO.java index 921d39b8..186beb15 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanMainImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanMainImportVO.java @@ -43,11 +43,11 @@ public class DeliverPlanMainImportVO { private LocalDateTime endTime; //子表数据 - @ExcelProperty("销售订单号") - private String soNumber; - - @ExcelProperty("销售订单行") - private BigDecimal soLine; +// @ExcelProperty("销售订单号") +// private String soNumber; +// +// @ExcelProperty("销售订单行") +// private BigDecimal soLine; @ExcelProperty("物品代码") private String itemCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/vo/SaleDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/vo/SaleDetailExportReqVO.java index 46491441..32830b77 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/vo/SaleDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/vo/SaleDetailExportReqVO.java @@ -83,4 +83,7 @@ public class SaleDetailExportReqVO { @Schema(description = "是否可用") private String available; + @Schema(description = "主表id") + private String masterId; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/vo/SaleDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/vo/SaleDetailPageReqVO.java index 02c84384..c4d440a3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/vo/SaleDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/vo/SaleDetailPageReqVO.java @@ -85,4 +85,6 @@ public class SaleDetailPageReqVO extends PageParam { @Schema(description = "是否可用") private String available; + @Schema(description = "主表id") + private String masterId; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverPlan/DeliverPlanMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverPlan/DeliverPlanMainDO.java index c7af172f..65930868 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverPlan/DeliverPlanMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverPlan/DeliverPlanMainDO.java @@ -1,5 +1,6 @@ package com.win.module.wms.dal.dataobject.deliverPlan; +import com.sun.xml.bind.v2.TODO; import lombok.*; import java.util.*; import java.time.LocalDateTime; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverPlan/DeliverPlanDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverPlan/DeliverPlanDetailMapper.java index f437010d..474bbc1f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverPlan/DeliverPlanDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverPlan/DeliverPlanDetailMapper.java @@ -22,6 +22,7 @@ public interface DeliverPlanDetailMapper extends BaseMapperX selectPage(DeliverPlanDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(DeliverPlanDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(DeliverPlanDetailDO::getSoNumber, reqVO.getSoNumber()) .eqIfPresent(DeliverPlanDetailDO::getSoLine, reqVO.getSoLine()) .eqIfPresent(DeliverPlanDetailDO::getCustomerDockCode, reqVO.getCustomerDockCode()) @@ -44,6 +45,7 @@ public interface DeliverPlanDetailMapper extends BaseMapperX selectList(DeliverPlanDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() + .eqIfPresent(DeliverPlanDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(DeliverPlanDetailDO::getSoNumber, reqVO.getSoNumber()) .eqIfPresent(DeliverPlanDetailDO::getSoLine, reqVO.getSoLine()) .eqIfPresent(DeliverPlanDetailDO::getCustomerDockCode, reqVO.getCustomerDockCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRequest/InventoryinitRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRequest/InventoryinitRequestDetailMapper.java index 3172dc36..24831fe7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRequest/InventoryinitRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRequest/InventoryinitRequestDetailMapper.java @@ -23,7 +23,7 @@ public interface InventoryinitRequestDetailMapper extends BaseMapperX selectPage(InventoryinitRequestDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eq(InventoryinitRequestDetailDO::getMasterId, reqVO.getMasterId()) + .eqIfPresent(InventoryinitRequestDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(InventoryinitRequestDetailDO::getOwnerCode, reqVO.getOwnerCode()) .eqIfPresent(InventoryinitRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) .eqIfPresent(InventoryinitRequestDetailDO::getContainerNumber, reqVO.getContainerNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptJob/ProductionreceiptJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptJob/ProductionreceiptJobDetailMapper.java index f5ea3b32..d196a89f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptJob/ProductionreceiptJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptJob/ProductionreceiptJobDetailMapper.java @@ -24,7 +24,7 @@ public interface ProductionreceiptJobDetailMapper extends BaseMapperX selectPage(ProductionreceiptJobDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eq(ProductionreceiptJobDetailDO::getMasterId, reqVO.getMasterId()) + .eqIfPresent(ProductionreceiptJobDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(ProductionreceiptJobDetailDO::getProductionLineCode, reqVO.getProductionLineCode()) .eqIfPresent(ProductionreceiptJobDetailDO::getWorkStationCode, reqVO.getWorkStationCode()) .eqIfPresent(ProductionreceiptJobDetailDO::getOnTheWayLocationCode, reqVO.getOnTheWayLocationCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/sale/SaleDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/sale/SaleDetailMapper.java index a5d93bc2..35b1badf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/sale/SaleDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/sale/SaleDetailMapper.java @@ -22,6 +22,7 @@ public interface SaleDetailMapper extends BaseMapperX { default PageResult selectPage(SaleDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(SaleDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(SaleDetailDO::getLineNumber, reqVO.getLineNumber()) .eqIfPresent(SaleDetailDO::getProjectCode, reqVO.getProjectCode()) .eqIfPresent(SaleDetailDO::getStdPackQty, reqVO.getStdPackQty()) @@ -52,6 +53,7 @@ public interface SaleDetailMapper extends BaseMapperX { default List selectList(SaleDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() + .eqIfPresent(SaleDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(SaleDetailDO::getLineNumber, reqVO.getLineNumber()) .eqIfPresent(SaleDetailDO::getProjectCode, reqVO.getProjectCode()) .eqIfPresent(SaleDetailDO::getStdPackQty, reqVO.getStdPackQty()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanDetailService.java index 0c2a3ff9..2a917e9a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanDetailService.java @@ -79,5 +79,7 @@ public interface DeliverPlanDetailService { */ List getDeliverPlanDetailList(DeliverPlanDetailExportReqVO exportReqVO); - List selectListByID(Long id); + List selectListByMasterID(Long masterId); + + DeliverPlanDetailDO selectDeliverPlanDetail(String number, String itemCode); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanDetailServiceImpl.java index afa2b4e6..c43954bb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanDetailServiceImpl.java @@ -1,13 +1,15 @@ package com.win.module.wms.service.deliverPlan; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.pojo.CustomConditions; import com.win.module.infra.api.trends.TrendsApi; import com.win.module.infra.enums.TrendsTypeEnum; +import com.win.module.system.api.serialnumber.SerialNumberApi; +import com.win.module.system.enums.serialNumber.RuleCodeEnum; import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanDetailCreateReqVO; import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanDetailExportReqVO; import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanDetailPageReqVO; import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanDetailUpdateReqVO; -import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.service.deliverJob.DeliverJobMainService; import com.win.module.wms.service.itembasic.ItembasicService; import org.springframework.stereotype.Service; @@ -42,11 +44,14 @@ public class DeliverPlanDetailServiceImpl implements DeliverPlanDetailService { private DeliverJobMainService deliverJobMainService; @Resource private TrendsApi trendsApi; + @Resource + private SerialNumberApi serialNumberApi; @Override public Long createDeliverPlanDetail(DeliverPlanDetailCreateReqVO createReqVO) { // 插入 DeliverPlanDetailDO deliverPlanDetail = DeliverPlanDetailConvert.INSTANCE.convert(createReqVO); - validateDetailCreate(deliverPlanDetail); + String number = serialNumberApi.generateCode(RuleCodeEnum.DELIVER_PLAN.getCode()); + deliverPlanDetail.setNumber(number); deliverPlanDetailMapper.insert(deliverPlanDetail); trendsApi.createTrends(deliverPlanDetail.getId(), "DeliverPlanDetail", "增加了发货计划子表", TrendsTypeEnum.CREATE); // 返回 @@ -101,25 +106,16 @@ public class DeliverPlanDetailServiceImpl implements DeliverPlanDetailService { } @Override - public List selectListByID(Long masterId){ + public List selectListByMasterID(Long masterId){ return deliverPlanDetailMapper.selectList(masterId); } - //校验子表公共方法(适用于新增/修改) - private void validateDetailCreate(DeliverPlanDetailDO deliverPlanDetailDO) { - ItembasicDO itembasicDO = this.validatorItembasic(deliverPlanDetailDO.getItemCode()); - if ( !deliverPlanDetailDO.getUom().equals(itembasicDO.getUom())) { - throw exception(UOM_ERROR, deliverPlanDetailDO.getUom()); - } - //TODO 暂时注释 - //this.validatorDetailExist(deliverPlanDetailDO.getSoNumber(), deliverPlanDetailDO.getSoLine(), deliverPlanDetailDO.getItemCode()); - } - private ItembasicDO validatorItembasic(String itemCode) { - return itembasicService.selectItembasic(itemCode); - } - //子表校验客户代码 - private void validatorDetailExist(String soNumber, String soLine, String itemCode) { - deliverJobMainService.saleDetailExist(soNumber, soLine, itemCode); + @Override + public DeliverPlanDetailDO selectDeliverPlanDetail(String number, String itemCode){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("number",number); + queryWrapper.eq("item_code",itemCode); + queryWrapper.eq("available","TRUE"); + return deliverPlanDetailMapper.selectOne(queryWrapper); } - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainService.java index 2a20c040..bec3c10e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainService.java @@ -152,4 +152,10 @@ public interface DeliverPlanMainService { */ Integer resettingDeliverPlanMain(Long id); + /** + * 校验发货计划是否存在 + * @param code + * @return + */ + DeliverPlanMainDO selectDeliverPlanExist(String code); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainServiceImpl.java index aa4643bf..3f283c17 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainServiceImpl.java @@ -107,7 +107,8 @@ public class DeliverPlanMainServiceImpl implements DeliverPlanMainService { if(!PlanStatusEnum.NEW.getCode().equals(deliverPlanMainDO.getStatus())) { throw exception(DELIVER_PLAN_STATUS_NOT_NEW); } - deliverPlanMainMapper.updateById(deliverPlanMainDO); + DeliverPlanMainDO mainDO = DeliverPlanMainConvert.INSTANCE.convert(updateReqVO); + deliverPlanMainMapper.updateById(mainDO); trendsApi.createTrends(updateReqVO.getId(), "DeliverPlanMain", deliverPlanMainDO.toString(), TrendsTypeEnum.UPDATE); } @@ -300,6 +301,19 @@ public class DeliverPlanMainServiceImpl implements DeliverPlanMainService { return deliverPlanMainMapper.updateById(mainDO); } + @Override + public DeliverPlanMainDO selectDeliverPlanExist(String code) { + QueryWrapper deliverPlanMainDOQueryWrapper = new QueryWrapper<>(); + deliverPlanMainDOQueryWrapper.eq("number",code); + deliverPlanMainDOQueryWrapper.eq("available","TRUE"); + DeliverPlanMainDO deliverPlanMainDO = deliverPlanMainMapper.selectOne(deliverPlanMainDOQueryWrapper); + if(deliverPlanMainDO != null){ + return deliverPlanMainDO; + }else { + throw exception(DELIVER_PLAN_MAIN_NOT_EXISTS); + } + } + @Override public DeliverPlanMainDO getDeliverPlanMain(Long id) { return deliverPlanMainMapper.selectById(id); @@ -346,7 +360,7 @@ public class DeliverPlanMainServiceImpl implements DeliverPlanMainService { // 是否有错误数据 boolean flag = true; for (DeliverPlanDetailDO detailDO : subDOList) { - String messageDetail = validateDeliverPlanDetailImport(detailDO, mainDo, businesstypeDO); + String messageDetail = validateDeliverPlanDetailImport(detailDO, mainDo); if (!messageMain.isEmpty() || !messageDetail.isEmpty()) { DeliverPlanMainImportErrorVO importErrorVO = DeliverPlanMainConvert.INSTANCE.convert(createReqVO, detailDO); importErrorVO.setImportStatus("失败"); @@ -417,7 +431,7 @@ public class DeliverPlanMainServiceImpl implements DeliverPlanMainService { * @param detailDo * @return */ - private String validateDeliverPlanDetailImport(DeliverPlanDetailDO detailDo, DeliverPlanMainDO mainDo, BusinesstypeDO businesstypeDO) { + private String validateDeliverPlanDetailImport(DeliverPlanDetailDO detailDo, DeliverPlanMainDO mainDo) { String messageDetail = ""; // 校验物品基础信息 try { @@ -428,6 +442,7 @@ public class DeliverPlanMainServiceImpl implements DeliverPlanMainService { } catch (ServiceException ex) { messageDetail += ex.getMessage() + ","; } + detailDo.setAvailable("TRUE"); //TODO 滞后 // 校验物品标包信息 // try { @@ -461,6 +476,7 @@ public class DeliverPlanMainServiceImpl implements DeliverPlanMainService { deliverPlanDetailDO.setNumber(deliverPlanMainDO.getNumber()); deliverPlanDetailDO.setMasterId(deliverPlanMainDO.getId()); deliverPlanDetailDO.setCustomerDockCode(null); + deliverPlanDetailDO.setAvailable("TRUE"); } deliverPlanDetailMapper.insertBatch(subDOList); return deliverPlanMainDO; @@ -492,7 +508,7 @@ public class DeliverPlanMainServiceImpl implements DeliverPlanMainService { private ItembasicDO validatorItembasic(String itemCode) { return itembasicService.selectItembasic(itemCode); } - //子表校验客户代码 + //子表校验销售订单明细 private void validatorDetailExist(String soNumber, String soLine, String itemCode) { deliverJobMainService.saleDetailExist(soNumber, soLine, itemCode); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainServiceImpl.java index bbc17bb1..7afdc6e7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainServiceImpl.java @@ -158,8 +158,9 @@ public class SaleMainServiceImpl implements SaleMainService { public SaleDetailDO selectSaleDetailDoExist(String psoNumber,String psoLine,String pitemCode) { QueryWrapper saleMainDOQueryWrapper = new QueryWrapper<>(); saleMainDOQueryWrapper.eq("number",psoNumber); + saleMainDOQueryWrapper.eq("available","TRUE"); SaleMainDO saleMainDO = saleMainMapper.selectOne(saleMainDOQueryWrapper); - if(saleMainDO != null && "TRUE".equals(saleMainDO.getAvailable())){ + if(saleMainDO != null){ QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("master_id",saleMainDO.getId()); queryWrapper.eq("item_code",pitemCode);