diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestMainController.java index cd2afac8..1542ab38 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestMainController.java @@ -209,4 +209,12 @@ public class SupplierdeliverRequestMainController { return success(count > 0); } + @PostMapping("/genLabel") + @Operation(summary = "生成标签") + @Parameter(name = "id", description = "编号", required = true) + public CommonResult genLabel(@RequestParam("id") String id) { + Integer count = supplierdeliverRequestMainService.genLabel(id); + return success(count > 0); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageMassage/PackageDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageMassage/PackageDO.java index 80ebbae8..f6ae080a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageMassage/PackageDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageMassage/PackageDO.java @@ -136,7 +136,7 @@ public class PackageDO{ /** * 采购计划单号 */ - private String rpNumber; + private String ppNumber; /** * 发货单号 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageMassage/PackageMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageMassage/PackageMapper.java index 6ad2ce51..d4ba53fe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageMassage/PackageMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageMassage/PackageMapper.java @@ -66,7 +66,7 @@ public interface PackageMapper extends BaseMapperX { .eqIfPresent(PackageDO::getSupplierItemCode, reqVO.getSupplierItemCode()) .eqIfPresent(PackageDO::getPoNumber, reqVO.getPoNumber()) .eqIfPresent(PackageDO::getPoLine, reqVO.getPoLine()) - .eqIfPresent(PackageDO::getRpNumber, reqVO.getRpNumber()) + .eqIfPresent(PackageDO::getPpNumber, reqVO.getRpNumber()) .eqIfPresent(PackageDO::getAsnNumber, reqVO.getAsnNumber()) .eqIfPresent(PackageDO::getWoNumber, reqVO.getWoNumber()) .eqIfPresent(PackageDO::getWoLine, reqVO.getWoLine()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainService.java index d3d2cf1b..09a2a67f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainService.java @@ -126,6 +126,15 @@ public interface SupplierdeliverRequestMainService { * @return 更新数量 */ Integer rejSupplierdeliverRequestMain(Long id); + + /** + * 生成标签 + * + * @param id 采采购订单申请主ID + * @return 更新数量 + */ + Integer genLabel(String id); + } 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 1fb578ad..93c33a87 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 @@ -24,6 +24,7 @@ import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; import com.win.module.wms.dal.dataobject.currencyexchange.CurrencyexchangeDO; import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.itempackaging.ItempackagingDO; +import com.win.module.wms.dal.dataobject.packageMassage.PackageDO; import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; import com.win.module.wms.dal.dataobject.purchase.PurchaseMainDO; import com.win.module.wms.dal.dataobject.purchasePlan.PurchasePlanDetailDO; @@ -466,4 +467,28 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq return supplierdeliverRequestMainMapper.updateById(mainDO); } + + /** + * 生成标签 + * + * @param id 采采购订单申请主ID + * @return 更新数量 + */ + @Override + @Transactional + public Integer genLabel(String id) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number", id); + SupplierdeliverRequestMainDO mainDO = supplierdeliverRequestMainMapper.selectOne(queryWrapper); + PackageDO packageDO = new PackageDO(); + packageDO.setSupplierCode(mainDO.getSupplierCode()); + packageDO.setSupplierItemCode(null); + packageDO.setPpNumber(mainDO.getPpNumber()); + + packageDO.setAsnNumber(mainDO.getAsnNumber()); + + + return 0; + } + }