diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordDetailController.java index 387a4b0d..67fdec3d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordDetailController.java @@ -3,7 +3,10 @@ package com.win.module.wms.controller.supplierdeliverRecord; import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanDetailRespVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.*; +import com.win.module.wms.convert.purchasePlan.PurchasePlanDetailConvert; +import com.win.module.wms.dal.dataobject.purchasePlan.PurchasePlanDetailDO; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -116,4 +119,13 @@ public class SupplierdeliverRecordDetailController { ExcelUtils.write(response, "供应商发货记录子.xls", "数据", SupplierdeliverRecordDetailExcelVO.class, datas); } +// @GetMapping("/allList") +// @Operation(summary = "高级搜索获得供应商发货记录子信息") +// @PreAuthorize("@ss.hasPermission('wms:supplierdeliver-record-detail:allList')") +// public CommonResult> selectAllList(@RequestParam String number) { +// List list = supplierdeliverRecordDetailService.selectAllList(number); +// List result = SupplierdeliverRecordDetailConvert.INSTANCE.convertList(list); +// return success(result); +// } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailBaseVO.java index b39d7d95..56bfed6b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailBaseVO.java @@ -153,5 +153,10 @@ public class SupplierdeliverRecordDetailBaseVO { @Schema(description = "到批次") private String toBatch; + /** + * 主表ID + */ + private Long masterId; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java index c61d9356..6ba20b42 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java @@ -60,6 +60,7 @@ import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import javax.validation.Validator; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -131,6 +132,7 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService RequestStatusState requestStatusState = new RequestStatusState(); requestStatusState.newObject(requestsettingDO.getAutoCommit(), requestsettingDO.getAutoAgree(), requestsettingDO.getAutoExecute()); mainDO.setStatus(requestStatusState.getState().getCode()); + mainDO.setRequestTime(LocalDateTime.now()); inspectRequestMainMapper.insert(mainDO); for (InspectRequestDetailDO detailDO : subDOList) { detailDO.setNumber(number); 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 82a1c90a..a742c4c4 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 @@ -168,13 +168,13 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService { @Override public PurchasePlanDetailDO selectPurchasePlan(String pnubmer, String psupplierCode, String ppoNumber, String ppoLine, String pitemCode) { - QueryWrapper queryWrapperMain = new QueryWrapper(); + QueryWrapper queryWrapperMain = new QueryWrapper<>(); queryWrapperMain.eq("number", pnubmer); queryWrapperMain.eq("supplier_code", psupplierCode); PurchasePlanMainDO purchasePlanMainDO = purchasePlanMainMapper.selectOne(queryWrapperMain); if (purchasePlanMainDO != null && "TRUE".equals(purchasePlanMainDO.getAvailable())) { if (!PurchasePlanStatusEnum.CLOSED.getCode().equals(purchasePlanMainDO.getStatus())) { - QueryWrapper queryWrapperDetail = new QueryWrapper(); + QueryWrapper queryWrapperDetail = new QueryWrapper<>(); queryWrapperDetail.eq("master_id", purchasePlanMainDO.getId()); queryWrapperDetail.eq("po_number", ppoNumber); queryWrapperDetail.eq("po_line", ppoLine); @@ -271,7 +271,7 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService { DictDataRespDTO uom = dictDataApi.selectDictTypeAndLabel(DictTypeConstants.UOM,detailDO.getUom()); detailDO.setUom(uom.getValue()); //选择已发布状态下订单号、订单行、零件号 判断订单类型 - QueryWrapper purchaseDetailDOQueryWrapper = new QueryWrapper(); + QueryWrapper purchaseDetailDOQueryWrapper = new QueryWrapper<>(); purchaseDetailDOQueryWrapper.eq("number", detailDO.getPoNumber()); purchaseDetailDOQueryWrapper.eq("item_code", detailDO.getItemCode()); purchaseDetailDOQueryWrapper.eq("line_number ", detailDO.getPoLine()); @@ -348,7 +348,7 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService { for (PurchasePlanDetailDO purchasePlanDetailDO : subDOList) { validatorDetailMethod(purchasePlanDetailDO, purchasePlanMainDO); //选择已发布状态下订单号、订单行、零件号 判断订单类型 - QueryWrapper purchaseDetailDOQueryWrapper = new QueryWrapper(); + QueryWrapper purchaseDetailDOQueryWrapper = new QueryWrapper<>(); purchaseDetailDOQueryWrapper.eq("number", purchasePlanDetailDO.getPoNumber()); purchaseDetailDOQueryWrapper.eq("item_code", purchasePlanDetailDO.getItemCode()); purchaseDetailDOQueryWrapper.eq("line_number ", purchasePlanDetailDO.getPoLine()); @@ -384,7 +384,7 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService { validatorDetailMethod(purchasePlanDetailDO, purchasePlanMainDO); } purchasePlanMainMapper.updateById(purchasePlanMainDO); - if (subDOList != null && subDOList.size() > 0) { + if (subDOList != null && !subDOList.isEmpty()) { purchasePlanDetailMapper.updateBatch(subDOList); } return purchasePlanMainDO; @@ -448,14 +448,14 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService { @Override @Transactional public void updatePlanPurchaseShippedQty(String number, String poNumber, String poLine, String itemCode, BigDecimal shippedQty) { - QueryWrapper purchasePlanMainDOQueryWrapper = new QueryWrapper(); + QueryWrapper purchasePlanMainDOQueryWrapper = new QueryWrapper<>(); purchasePlanMainDOQueryWrapper.eq("number", poNumber); purchasePlanMainDOQueryWrapper.eq("status", PurchasePlanStatusEnum.ACCEPTED.getCode()); List purchasePlanMainDOList = purchasePlanMainMapper.selectList(purchasePlanMainDOQueryWrapper); if (purchasePlanMainDOList != null && !purchasePlanMainDOList.isEmpty()) { for (PurchasePlanMainDO purchasePlanMainDO : purchasePlanMainDOList) { int i = 0; - QueryWrapper purchasePlanDetailDOQueryWrapper = new QueryWrapper(); + QueryWrapper purchasePlanDetailDOQueryWrapper = new QueryWrapper<>(); purchasePlanDetailDOQueryWrapper.eq("number", poNumber); purchasePlanDetailDOQueryWrapper.eq("po_line", poLine); purchasePlanDetailDOQueryWrapper.eq("item_code", itemCode); 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 e3f8f157..bb531fab 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 @@ -30,6 +30,8 @@ import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptR import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestMainDO; import com.win.module.wms.dal.dataobject.shift.ShiftDO; import com.win.module.wms.dal.dataobject.supplier.SupplierDO; +import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; +import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordMainDO; import com.win.module.wms.dal.dataobject.supplierdeliverRequest.SupplierdeliverRequestDetailDO; import com.win.module.wms.dal.dataobject.supplierdeliverRequest.SupplierdeliverRequestMainDO; import com.win.module.wms.dal.dataobject.supplieritem.SupplieritemDO; @@ -639,7 +641,6 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq return result; } - /** * 处理操作（生成记录，生成采购收货申请） * @@ -671,24 +672,36 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq supplierdeliverRecordMainCreateReqVO.setExecuteTime(LocalDateTime.now()); supplierdeliverRecordMainCreateReqVO.setActiveDate(LocalDateTime.now()); supplierdeliverRecordMainCreateReqVO.setDepartmentCode(mainDO.getDepartmentCode()); - supplierdeliverRecordMainMapper.insert(SupplierdeliverRecordMainConvert.INSTANCE.convert(supplierdeliverRecordMainCreateReqVO)); + SupplierdeliverRecordMainDO supplierdeliverRecordMainDO = SupplierdeliverRecordMainConvert.INSTANCE.convert(supplierdeliverRecordMainCreateReqVO); + supplierdeliverRecordMainDO.setId(null); + supplierdeliverRecordMainDO.setCreator(null); + supplierdeliverRecordMainDO.setCreateTime(null); + supplierdeliverRecordMainDO.setUpdater(null); + supplierdeliverRecordMainDO.setUpdateTime(null); + supplierdeliverRecordMainMapper.insert(supplierdeliverRecordMainDO); for (SupplierdeliverRequestDetailDO supplierdeliverRequestDetailDO : detailDOList) { - SupplierdeliverRecordDetailCreateReqVO supplierdeliverRecordDetailCreateReqVO = new SupplierdeliverRecordDetailCreateReqVO(); - BeanUtils.copyProperties(supplierdeliverRequestDetailDO, supplierdeliverRecordDetailCreateReqVO); - supplierdeliverRecordDetailCreateReqVO.setNumber(number); - supplierdeliverRecordDetailCreateReqVO.setFromPackingNumber(""); - supplierdeliverRecordDetailCreateReqVO.setToPackingNumber(""); - supplierdeliverRecordDetailCreateReqVO.setFromBatch(""); - supplierdeliverRecordDetailCreateReqVO.setToBatch(""); - supplierdeliverRecordDetailCreateReqVO.setAltBatch(""); - supplierdeliverRecordDetailCreateReqVO.setFromContainerNumber(""); - supplierdeliverRecordDetailCreateReqVO.setToContainerNumber(""); + SupplierdeliverRecordDetailDO supplierdeliverRecordDetailDO = new SupplierdeliverRecordDetailDO(); + BeanUtils.copyProperties(supplierdeliverRequestDetailDO, supplierdeliverRecordDetailDO); + supplierdeliverRecordDetailDO.setNumber(number); + supplierdeliverRecordDetailDO.setMasterId(supplierdeliverRecordMainDO.getId()); + supplierdeliverRecordDetailDO.setFromPackingNumber(""); + supplierdeliverRecordDetailDO.setToPackingNumber(""); + supplierdeliverRecordDetailDO.setFromBatch(""); + supplierdeliverRecordDetailDO.setToBatch(""); + supplierdeliverRecordDetailDO.setAltBatch(""); + supplierdeliverRecordDetailDO.setFromContainerNumber(""); + supplierdeliverRecordDetailDO.setToContainerNumber(""); SupplieritemDO supplieritemDO = supplieritemService.selectSupplierItemExist(mainDO.getSupplierCode(), supplierdeliverRequestDetailDO.getItemCode()); - supplierdeliverRecordDetailCreateReqVO.setToLocationCode(supplieritemDO.getDefaultLocationCode()); + supplierdeliverRecordDetailDO.setToLocationCode(supplieritemDO.getDefaultLocationCode()); LocationDO locationDO = locationService.selectLocation(supplieritemDO.getDefaultLocationCode()); - supplierdeliverRecordDetailCreateReqVO.setToAreaCode(locationDO.getAreaCode()); - supplierdeliverRecordDetailCreateReqVO.setToLocationGroupCode(locationDO.getLocationGroupCode()); - supplierdeliverRecordDetailMapper.insert(SupplierdeliverRecordDetailConvert.INSTANCE.convert(supplierdeliverRecordDetailCreateReqVO)); + supplierdeliverRecordDetailDO.setToAreaCode(locationDO.getAreaCode()); + supplierdeliverRecordDetailDO.setToLocationGroupCode(locationDO.getLocationGroupCode()); + supplierdeliverRecordDetailDO.setId(null); + supplierdeliverRecordDetailDO.setCreator(null); + supplierdeliverRecordDetailDO.setCreateTime(null); + supplierdeliverRecordDetailDO.setUpdater(null); + supplierdeliverRecordDetailDO.setUpdateTime(null); + supplierdeliverRecordDetailMapper.insert(supplierdeliverRecordDetailDO); } //生成采购收货申请 叶佳兴 @@ -696,6 +709,11 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq BeanUtils.copyProperties(mainDO, purchasereceiptRequestMainDO); String number2 = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_REQUEST.getCode()); purchasereceiptRequestMainDO.setNumber(number2); + purchasereceiptRequestMainDO.setId(null); + purchasereceiptRequestMainDO.setCreator(null); + purchasereceiptRequestMainDO.setCreateTime(null); + purchasereceiptRequestMainDO.setUpdater(null); + purchasereceiptRequestMainDO.setUpdateTime(null); purchasereceiptRequestMainMapper.insert(purchasereceiptRequestMainDO); for (SupplierdeliverRequestDetailDO detailDO : detailDOList) { //包装 @@ -723,8 +741,12 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq SupplieritemDO supplieritemDO = supplieritemService.selectSupplierItemExist(mainDO.getSupplierCode(), detailDO.getItemCode()); purchasereceiptRequestDetailDO.setDefaultToLocationCode(supplieritemDO.getDefaultLocationCode()); purchasereceiptRequestDetailDO.setRemark(null); - purchasereceiptRequestDetailDO.setCreateTime(LocalDateTime.now()); purchasereceiptRequestDetailDO.setSiteId(null); + purchasereceiptRequestDetailDO.setId(null); + purchasereceiptRequestDetailDO.setCreator(null); + purchasereceiptRequestDetailDO.setCreateTime(null); + purchasereceiptRequestDetailDO.setUpdater(null); + purchasereceiptRequestDetailDO.setUpdateTime(null); purchasereceiptRequestDetailMapper.insert(purchasereceiptRequestDetailDO); } //更新要货计划的已发货数量