diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseDetailController.java index 7fd6d4dd..ebb4bf32 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.purchase; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.pojo.CommonResult; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; @@ -9,7 +10,9 @@ import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchase.vo.*; import com.win.module.wms.convert.purchase.PurchaseDetailConvert; +import com.win.module.wms.dal.dataobject.packageMassage.PackageDO; import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; +import com.win.module.wms.dal.mysql.purchase.PurchaseDetailMapper; import com.win.module.wms.service.purchase.PurchaseDetailService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -36,6 +39,9 @@ public class PurchaseDetailController { @Resource private PurchaseDetailService purchaseDetailService; + @Resource + private PurchaseDetailMapper purchaseDetailMapper; + @Resource private AdminUserApi userApi; @@ -120,4 +126,14 @@ public class PurchaseDetailController { ExcelUtils.write(response, "采购订单子.xls", "数据", PurchaseDetailExcelVO.class, datas); } + @GetMapping("/selectAll") + @Operation(summary = "获得采购订单子分页") + @PreAuthorize("@ss.hasPermission('wms:purchase-detail:selectAll')") + public CommonResult> selectAll(@Valid PurchaseDetailPageReqVO pageVO) { + QueryWrapper purchaseDetailDOQueryWrapper = new QueryWrapper(); + purchaseDetailDOQueryWrapper.eq("master_id", pageVO.getMasterId()); + List purchaseDetailDOList = purchaseDetailMapper.selectList(purchaseDetailDOQueryWrapper); + return success(purchaseDetailDOList); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanDetailController.java index bcaef4f8..ea4490a8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanDetailController.java @@ -121,8 +121,8 @@ public class PurchasePlanDetailController { @GetMapping("/allList") @Operation(summary = "高级搜索获得要货计划子信息") @PreAuthorize("@ss.hasPermission('wms:purchase-plan-detail:allList')") - public CommonResult> selectAllList(@RequestParam String poNumber) { - List list = purchasePlanDetailService.selectAllList(poNumber); + public CommonResult> selectAllList(@RequestParam String number) { + List list = purchasePlanDetailService.selectAllList(number); List result = PurchasePlanDetailConvert.INSTANCE.convertList(list); return success(result); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasePlan/PurchasePlanDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasePlan/PurchasePlanDetailMapper.java index 499c07db..9d089bcd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasePlan/PurchasePlanDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasePlan/PurchasePlanDetailMapper.java @@ -61,9 +61,9 @@ public interface PurchasePlanDetailMapper extends BaseMapperX selectAllList(String poNumber) { + default List selectAllList(String number) { return selectList(new LambdaQueryWrapperX() - .eq(PurchasePlanDetailDO::getPoNumber, poNumber)); + .eq(PurchasePlanDetailDO::getNumber, number)); } } 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 7cd00b02..aa986dca 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 @@ -343,6 +343,11 @@ public class PurchaseMainServiceImpl implements PurchaseMainService { //子表校验 List subList = createReqVO.getSubList(); List subDOList = PurchaseDetailConvert.INSTANCE.convertList03(subList); + purchaseMainDO.setId(null); + purchaseMainDO.setCreator(null); + purchaseMainDO.setCreateTime(null); + purchaseMainDO.setUpdater(null); + purchaseMainDO.setUpdateTime(null); purchaseMainMapper.insert(purchaseMainDO); for (PurchaseDetailDO purchaseDetailDO : subDOList) { validatorDetailMethod(purchaseDetailDO, purchaseMainDO); @@ -356,6 +361,11 @@ public class PurchaseMainServiceImpl implements PurchaseMainService { purchaseDetailDO.setErpLocationCode(null); purchaseDetailDO.setAvailable("TRUE"); purchaseDetailDO.setStatus(OrderStatusEnum.READY.getCode()); + purchaseDetailDO.setId(null); + purchaseDetailDO.setCreator(null); + purchaseDetailDO.setCreateTime(null); + purchaseDetailDO.setUpdater(null); + purchaseDetailDO.setUpdateTime(null); } purchaseDetailMapper.insertBatch(subDOList); return purchaseMainDO; @@ -535,6 +545,11 @@ public class PurchaseMainServiceImpl implements PurchaseMainService { purchasePlanMainDO.setEndTime(String.valueOf(conditionObject.get("EndTime"))); purchasePlanMainDO.setTimeWindow(purchasePlanMainDO.getBeginTime() + "-" + purchasePlanMainDO.getEndTime()); } + purchasePlanMainDO.setId(null); + purchasePlanMainDO.setCreator(null); + purchasePlanMainDO.setCreateTime(null); + purchasePlanMainDO.setUpdater(null); + purchasePlanMainDO.setUpdateTime(null); purchasePlanMainMapper.insert(purchasePlanMainDO); //新增要货计划子表 QueryWrapper purchaseDetailDOQueryWrapper = new QueryWrapper<>(); @@ -551,6 +566,11 @@ public class PurchaseMainServiceImpl implements PurchaseMainService { purchasePlanDetailDO.setShippedQty(BigDecimal.ZERO); purchasePlanDetailDO.setAvailable("TRUE"); purchasePlanDetailDO.setTenantId(1L); + purchasePlanDetailDO.setId(null); + purchasePlanDetailDO.setCreator(null); + purchasePlanDetailDO.setCreateTime(null); + purchasePlanDetailDO.setUpdater(null); + purchasePlanDetailDO.setUpdateTime(null); purchasePlanDetailMapper.insert(purchasePlanDetailDO); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanDetailService.java index bc129e2f..543fc970 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanDetailService.java @@ -83,9 +83,9 @@ public interface PurchasePlanDetailService { /** * 根据主表number查询 - * @param poNumber + * @param number * @return */ - List selectAllList(String poNumber); + List selectAllList(String number); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanDetailServiceImpl.java index a7365453..28e48f02 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanDetailServiceImpl.java @@ -92,9 +92,9 @@ public class PurchasePlanDetailServiceImpl implements PurchasePlanDetailService return purchasePlanDetailMapper.selectList(exportReqVO); } @Override - public List selectAllList(String poNumber) { + public List selectAllList(String number) { List newList = new ArrayList<>(); - List purchasePlanDetailDOList = purchasePlanDetailMapper.selectAllList(poNumber); + List purchasePlanDetailDOList = purchasePlanDetailMapper.selectAllList(number); for (PurchasePlanDetailDO purchasePlanDetailDO : purchasePlanDetailDOList) { if(purchasePlanDetailDO.getPlanQty().compareTo(purchasePlanDetailDO.getShippedQty())> 0){ newList.add(purchasePlanDetailDO); 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 1964f342..82a1c90a 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 @@ -257,6 +257,11 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService { String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_PLAN.getCode()); mainDo.setNumber(number); mainDo.setAvailable("TRUE"); + mainDo.setId(null); + mainDo.setCreator(null); + mainDo.setCreateTime(null); + mainDo.setUpdater(null); + mainDo.setUpdateTime(null); purchasePlanMainMapper.insert(mainDo); for (PurchasePlanDetailDO detailDO : subDOList) { detailDO.setMasterId(mainDo.getId()); @@ -278,6 +283,11 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService { detailDO.setPlanQty(purchaseDetailDO.getOrderQty().subtract(purchaseDetailDO.getPlannedQty())); } } + detailDO.setId(null); + detailDO.setCreator(null); + detailDO.setCreateTime(null); + detailDO.setUpdater(null); + detailDO.setUpdateTime(null); } purchasePlanDetailMapper.insertBatch(subDOList); } @@ -329,6 +339,11 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService { //子表校验 List subList = createReqVO.getSubList(); List subDOList = PurchasePlanDetailConvert.INSTANCE.convertList03(subList); + purchasePlanMainDO.setId(null); + purchasePlanMainDO.setCreator(null); + purchasePlanMainDO.setCreateTime(null); + purchasePlanMainDO.setUpdater(null); + purchasePlanMainDO.setUpdateTime(null); purchasePlanMainMapper.insert(purchasePlanMainDO); for (PurchasePlanDetailDO purchasePlanDetailDO : subDOList) { validatorDetailMethod(purchasePlanDetailDO, purchasePlanMainDO); @@ -349,6 +364,11 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService { purchasePlanDetailDO.setNumber(purchasePlanMainDO.getNumber()); purchasePlanDetailDO.setShippedQty(BigDecimal.ZERO); purchasePlanDetailDO.setAvailable("TRUE"); + purchasePlanDetailDO.setId(null); + purchasePlanDetailDO.setCreator(null); + purchasePlanDetailDO.setCreateTime(null); + purchasePlanDetailDO.setUpdater(null); + purchasePlanDetailDO.setUpdateTime(null); } purchasePlanDetailMapper.insertBatch(subDOList); return purchasePlanMainDO; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java index e394173f..e3f8f157 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java @@ -124,6 +124,7 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq private LocationService locationService; @Override + @Transactional public Long createSupplierdeliverRequestMain(SupplierdeliverRequestMainCreateReqVO createReqVO) { // 插入主表 BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("SupplierDeliverRequest"); @@ -142,6 +143,7 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq } @Override + @Transactional public Long updateSupplierdeliverRequestMain(SupplierdeliverRequestMainUpdateReqVO updateReqVO) { // 校验存在，如子表需要也再此校验 validateSupplierdeliverRequestMainExists(updateReqVO.getId()); @@ -197,7 +199,8 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq return supplierdeliverRequestMainMapper.selectList(exportReqVO); } - + @Override + @Transactional public List importSupplierdeliverRequestMainList(List datas, Integer mode, boolean updatePart) { if (CollUtil.isEmpty(datas)) { throw exception(PURCHASECLAIM_REQUEST_IMPORT_LIST_IS_EMPTY); @@ -234,10 +237,20 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq //写入数据 if (flag) { mainDo.setStatus(DictFrameworkUtils.parseDictDataValue(DictTypeConstants.REQUEST_STATUS, "新增")); + mainDo.setId(null); + mainDo.setCreator(null); + mainDo.setCreateTime(null); + mainDo.setUpdater(null); + mainDo.setUpdateTime(null); supplierdeliverRequestMainMapper.insert(mainDo); for (SupplierdeliverRequestDetailDO detailDO : subDOList) { detailDO.setMasterId(mainDo.getId()); detailDO.setNumber(mainDo.getNumber()); + detailDO.setId(null); + detailDO.setCreator(null); + detailDO.setCreateTime(null); + detailDO.setUpdater(null); + detailDO.setUpdateTime(null); } supplierdeliverRequestDetailMapper.insertBatch(subDOList); } @@ -277,6 +290,8 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq } //校验主表公共方法(适用于新增/修改) + + @Transactional private SupplierdeliverRequestMainDO validatorMainMethod(SupplierdeliverRequestMainBaseVO baseVO) { SupplierdeliverRequestMainDO mainDo = SupplierdeliverRequestMainConvert.INSTANCE.convert(baseVO); SupplierDO supplierDO = this.validatorSupplier(mainDo.getSupplierCode()); @@ -297,6 +312,8 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq } //校验子表公共方法(适用于新增/修改) + + @Transactional private void validatorDetailMethod(SupplierdeliverRequestDetailDO detailDo, SupplierdeliverRequestMainDO mainDo) { this.validatorItembasic(detailDo.getItemCode()); this.validatorSupplierItemExist(mainDo.getSupplierCode(), detailDo.getItemCode()); @@ -312,23 +329,35 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq } //新增校验 + @Transactional private SupplierdeliverRequestMainDO validatorToCreate(SupplierdeliverRequestMainCreateReqVO createReqVO) { SupplierdeliverRequestMainDO supplierdeliverRequestMainDO = validatorMainMethod(createReqVO); //子表校验 List subList = createReqVO.getSubList(); List subDOList = SupplierdeliverRequestDetailConvert.INSTANCE.convertList03(subList); + supplierdeliverRequestMainDO.setId(null); + supplierdeliverRequestMainDO.setCreator(null); + supplierdeliverRequestMainDO.setCreateTime(null); + supplierdeliverRequestMainDO.setUpdater(null); + supplierdeliverRequestMainDO.setUpdateTime(null); supplierdeliverRequestMainMapper.insert(supplierdeliverRequestMainDO); for (SupplierdeliverRequestDetailDO supplierdeliverRequestDetailDO : subDOList) { validatorDetailMethod(supplierdeliverRequestDetailDO, supplierdeliverRequestMainDO); supplierdeliverRequestDetailDO.setMasterId(supplierdeliverRequestMainDO.getId()); supplierdeliverRequestDetailDO.setNumber(supplierdeliverRequestMainDO.getNumber()); supplierdeliverRequestDetailDO.setConvertRate(new BigDecimal(0)); + supplierdeliverRequestDetailDO.setId(null); + supplierdeliverRequestDetailDO.setCreator(null); + supplierdeliverRequestDetailDO.setCreateTime(null); + supplierdeliverRequestDetailDO.setUpdater(null); + supplierdeliverRequestDetailDO.setUpdateTime(null); } supplierdeliverRequestDetailMapper.insertBatch(subDOList); return supplierdeliverRequestMainDO; } //修改校验 + @Transactional private SupplierdeliverRequestMainDO validatorToUpdate(SupplierdeliverRequestMainUpdateReqVO updateReqVO) { SupplierdeliverRequestMainDO supplierdeliverRequestMainDO = validatorMainMethod(updateReqVO); //子表校验 @@ -350,6 +379,8 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq * @param createReqVO * @return */ + + @Transactional private String validatorSupplierdeliverRequestMainImport(SupplierdeliverRequestMainDO createReqVO) { String messageMain = ""; //校验供应商基础信息 @@ -378,6 +409,8 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq * @param supplierdeliverRequestMainDO * @return */ + + @Transactional private String validatorSupplierdeliverRequestDetailImport(SupplierdeliverRequestDetailDO supplierdeliverRequestDetailDO, SupplierdeliverRequestMainDO supplierdeliverRequestMainDO) { String messageDetail = ""; // 校验物品基础信息 @@ -621,8 +654,6 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("id", id); SupplierdeliverRequestMainDO mainDO = supplierdeliverRequestMainMapper.selectOne(queryWrapper); - mainDO.setStatus(RequestStatusEnum.COMPLETED.getCode()); - supplierdeliverRequestMainMapper.updateBatch(mainDO); //子表 QueryWrapper supplierdeliverRequestDetailDOQueryWrapper = new QueryWrapper(); supplierdeliverRequestDetailDOQueryWrapper.eq("master_id", id); @@ -702,7 +733,11 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq //更新要货计划的已发货数量 purchaseMainService.updateOrderPurchaseShippedQty(detailDO.getPoNumber(), detailDO.getPoLine(), detailDO.getItemCode(), detailDO.getQty()); } - trendsApi.createTrends(mainDO.getId(), "SupplierdeliverRequest", "处理了供应商发货申请", TrendsTypeEnum.CREATE); + + SupplierdeliverRequestMainDO supplierdeliverRequestMain = supplierdeliverRequestMainMapper.selectById(id); + supplierdeliverRequestMain.setStatus(RequestStatusEnum.COMPLETED.getCode()); + supplierdeliverRequestMainMapper.updateById(supplierdeliverRequestMain); + trendsApi.createTrends(supplierdeliverRequestMain.getId(), "SupplierdeliverRequest", "处理了供应商发货申请", TrendsTypeEnum.CREATE); return result; }