diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageBaseVO.java index 05d91d32..9c279671 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageBaseVO.java @@ -29,7 +29,6 @@ public class PackageBaseVO { private String itemCode; @Schema(description = "物品名称", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品名称不能为空") private String itemName; @Schema(description = "物品描述1") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java index 64a8ec6d..178c6dc1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java @@ -10,11 +10,14 @@ import com.win.module.system.api.user.AdminUserApi; import com.win.module.wms.controller.balance.vo.BalanceExportReqVO; import com.win.module.wms.controller.balance.vo.BalancePageReqVO; import com.win.module.wms.controller.balance.vo.BalanceUpdateReqVO; +import com.win.module.wms.controller.packageMassage.vo.PackageUpdateReqVO; import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; import com.win.module.wms.convert.balance.BalanceConvert; import com.win.module.wms.dal.dataobject.balance.BalanceDO; import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO; import com.win.module.wms.dal.mysql.balance.BalanceMapper; +import com.win.module.wms.dal.mysql.packageMassage.PackageMapper; +import com.win.module.wms.service.packageMassage.PackageService; import com.win.module.wms.service.transaction.TransactionService; import com.win.module.wms.util.JobUtils; import org.springframework.beans.BeanUtils; @@ -39,6 +42,10 @@ import static com.win.module.wms.enums.ErrorCodeConstants.UNPLANNEDISSUE_REQUEST @Validated public class BalanceServiceImpl implements BalanceService { + @Resource + private PackageService packageService; + @Resource + private PackageMapper packageMapper; @Resource private TransactionService transactionService; @Resource @@ -229,6 +236,17 @@ public class BalanceServiceImpl implements BalanceService { transactionCreateReqVOOut.setQty(balanceDO.getQty()); transactionCreateReqVOOut.setExpireDate(balanceDO.getExpireDate()); transactionCreateReqVOList.add(transactionCreateReqVOOut); + // 更新包装信息 + PackageUpdateReqVO packageUpdateReqVO = new PackageUpdateReqVO(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("number",balanceDO.getPackingNumber()); + packageUpdateReqVO.setId(packageMapper.selectOne(queryWrapper).getId()); + packageUpdateReqVO.setNumber(balanceDO.getPackingNumber()); + packageUpdateReqVO.setItemCode(balanceDO.getItemCode()); + packageUpdateReqVO.setBatch(updateBalanceDO.getBatch()); + packageUpdateReqVO.setQty(updateBalanceDO.getQty()); + packageUpdateReqVO.setExpireDate(updateBalanceDO.getExpireDate()); + packageService.updatePackage(packageUpdateReqVO); //增加库存事务 transactionService.createTransaction(transactionCreateReqVOList); }