From edafce611aeb7c49b33d7fef894cf3a1b936b649 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Wed, 13 Nov 2024 16:41:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A2=86=E6=96=99=E7=AE=A1=E7=90=86--?= =?UTF-8?q?=E9=A2=86=E6=96=99=E4=BB=BB=E5=8A=A1=E5=8F=91=E5=B8=83=E3=80=81?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9E=9A=E4=B8=BE=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/enums/PurchaseTaskStatusEnum.java | 4 ++- .../controller/LeaseApplyInfoController.java | 12 ++++++++ .../lease/mapper/LeaseApplyInfoMapper.java | 12 ++++---- .../lease/service/ILeaseApplyInfoService.java | 5 ++++ .../service/ILeaseOutDetailsService.java | 12 ++++---- .../impl/LeaseApplyInfoServiceImpl.java | 29 +++++++++++++++++++ 6 files changed, 61 insertions(+), 13 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/PurchaseTaskStatusEnum.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/PurchaseTaskStatusEnum.java index 86c5a2a0..0eb7316b 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/PurchaseTaskStatusEnum.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/PurchaseTaskStatusEnum.java @@ -14,7 +14,9 @@ public enum PurchaseTaskStatusEnum { IN_STORE(19, "已入库"), TASK_TO_START(20, "入库待开始"), TASK_IN_PROGRESS(21, "入库进行中"), - TASK_FINISHED(22, "入库已完成"); + TASK_FINISHED(22, "入库已完成"), + LEASE_TASK_NO_PUBLISHED(0, "领料任务--未发布"), + LEASE_TASK_PUBLISHED(1, "领料任务--已发布"); private final Integer status; private final String statusName; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java index 05a10e1c..a8161499 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java @@ -101,6 +101,18 @@ public class LeaseApplyInfoController extends BaseController { } } + + /** + * 领料任务发布 + */ + @ApiOperation(value = "领料任务发布") + @PreventRepeatSubmit + @SysLog(title = "领料任务发布", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->发布领料任务") + @PostMapping("/publish") + public AjaxResult publish(@RequestBody @NotNull(message = "任务信息不能为空") LeaseApplyInfo leaseApplyInfo) { + return leaseApplyInfoService.publish(leaseApplyInfo); + } + /** * 删除领料任务 */ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java index 6b490575..98f18157 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java @@ -16,7 +16,7 @@ public interface LeaseApplyInfoMapper { * @param id 领料任务主键 * @return 领料任务 */ - public LeaseApplyInfo selectLeaseApplyInfoById(Long id); + LeaseApplyInfo selectLeaseApplyInfoById(Long id); /** * 查询领料任务列表 @@ -24,7 +24,7 @@ public interface LeaseApplyInfoMapper { * @param leaseApplyInfo 领料任务 * @return 领料任务集合 */ - public List selectLeaseApplyInfoList(LeaseApplyInfo leaseApplyInfo); + List selectLeaseApplyInfoList(LeaseApplyInfo leaseApplyInfo); /** * 新增领料任务 @@ -32,7 +32,7 @@ public interface LeaseApplyInfoMapper { * @param leaseApplyInfo 领料任务 * @return 结果 */ - public int insertLeaseApplyInfo(LeaseApplyInfo leaseApplyInfo); + int insertLeaseApplyInfo(LeaseApplyInfo leaseApplyInfo); /** * 修改领料任务 @@ -40,7 +40,7 @@ public interface LeaseApplyInfoMapper { * @param leaseApplyInfo 领料任务 * @return 结果 */ - public int updateLeaseApplyInfo(LeaseApplyInfo leaseApplyInfo); + int updateLeaseApplyInfo(LeaseApplyInfo leaseApplyInfo); /** * 删除领料任务 @@ -48,7 +48,7 @@ public interface LeaseApplyInfoMapper { * @param id 领料任务主键 * @return 结果 */ - public int deleteLeaseApplyInfoById(Long id); + int deleteLeaseApplyInfoById(Long id); /** * 批量删除领料任务 @@ -56,5 +56,5 @@ public interface LeaseApplyInfoMapper { * @param ids 需要删除的数据主键集合 * @return 结果 */ - public int deleteLeaseApplyInfoByIds(Long[] ids); + int deleteLeaseApplyInfoByIds(Long[] ids); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseApplyInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseApplyInfoService.java index 02ce5716..a74bbc2a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseApplyInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseApplyInfoService.java @@ -38,6 +38,11 @@ public interface ILeaseApplyInfoService { */ AjaxResult insertLeaseApplyInfo(TmTaskRequestVo leaseApplyRequestVo); + /** + * 发布任务 + */ + AjaxResult publish(LeaseApplyInfo leaseApplyInfo); + /** * 修改领料任务 * diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseOutDetailsService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseOutDetailsService.java index 271828df..22a77582 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseOutDetailsService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseOutDetailsService.java @@ -18,7 +18,7 @@ public interface ILeaseOutDetailsService { * @param id 领料出库详细主键 * @return 领料出库详细 */ - public LeaseOutDetails selectLeaseOutDetailsById(Long id); + LeaseOutDetails selectLeaseOutDetailsById(Long id); /** * 查询领料出库详细列表 @@ -26,7 +26,7 @@ public interface ILeaseOutDetailsService { * @param leaseOutDetails 领料出库详细 * @return 领料出库详细集合 */ - public List selectLeaseOutDetailsList(LeaseOutDetails leaseOutDetails); + List selectLeaseOutDetailsList(LeaseOutDetails leaseOutDetails); /** * 新增领料出库详细 @@ -34,7 +34,7 @@ public interface ILeaseOutDetailsService { * @param leaseOutDetailsList 领料出库详细 * @return 结果 */ - public AjaxResult insertLeaseOutDetails(List leaseOutDetailsList); + AjaxResult insertLeaseOutDetails(List leaseOutDetailsList); /** * 修改领料出库详细 @@ -42,7 +42,7 @@ public interface ILeaseOutDetailsService { * @param leaseOutDetails 领料出库详细 * @return 结果 */ - public int updateLeaseOutDetails(LeaseOutDetails leaseOutDetails); + int updateLeaseOutDetails(LeaseOutDetails leaseOutDetails); /** * 批量删除领料出库详细 @@ -50,7 +50,7 @@ public interface ILeaseOutDetailsService { * @param ids 需要删除的领料出库详细主键集合 * @return 结果 */ - public int deleteLeaseOutDetailsByIds(Long[] ids); + int deleteLeaseOutDetailsByIds(Long[] ids); /** * 删除领料出库详细信息 @@ -58,5 +58,5 @@ public interface ILeaseOutDetailsService { * @param id 领料出库详细主键 * @return 结果 */ - public int deleteLeaseOutDetailsById(Long id); + int deleteLeaseOutDetailsById(Long id); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java index 3afaf86e..50922867 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java @@ -134,6 +134,35 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { } } + /** + * 发布任务 + * + * @param leaseApplyInfo 领料任务info + */ + @Override + public AjaxResult publish(LeaseApplyInfo leaseApplyInfo) { + if (leaseApplyInfo.getId() == null) { + return AjaxResult.error("ID为空,请完善后重新发布!"); + } + if (leaseApplyInfo.getTaskId() == null) { + return AjaxResult.error("任务ID为空,请完善后重新发布!"); + } + + leaseApplyInfo.setUpdateTime(DateUtils.getNowDate()); + leaseApplyInfo.setStatus(String.valueOf(PurchaseTaskStatusEnum.LEASE_TASK_PUBLISHED.getStatus())); + int result = leaseApplyInfoMapper.updateLeaseApplyInfo(leaseApplyInfo); + if (result > 0) { + // 同步修改tm_task任务状态 + TmTask tmTask = new TmTask(); + tmTask.setTaskId(leaseApplyInfo.getTaskId()); + tmTask.setStatus(String.valueOf(PurchaseTaskStatusEnum.LEASE_TASK_PUBLISHED.getStatus())); + tmTaskMapper.updateTmTask(tmTask); + return AjaxResult.success("发布成功"); + } else { + return AjaxResult.error("发布失败"); + } + } + private AjaxResult insertPurchaseCheckDetails(List leaseApplyDetailsList, Long taskId) { if (!CollectionUtils.isEmpty(leaseApplyDetailsList)) { for (LeaseApplyDetails details : leaseApplyDetailsList) { From b099235b488e62f4df66012a97168b6cc0445d53 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Wed, 13 Nov 2024 16:45:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A2=86=E6=96=99=E7=AE=A1=E7=90=86--?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=8B=E5=8A=A1=E3=80=81=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LeaseApplyInfoServiceImpl.java | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java index 50922867..11bfa242 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java @@ -24,6 +24,7 @@ import org.springframework.stereotype.Service; import com.bonus.material.lease.mapper.LeaseApplyInfoMapper; import com.bonus.material.lease.domain.LeaseApplyInfo; import com.bonus.material.lease.service.ILeaseApplyInfoService; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -140,6 +141,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { * @param leaseApplyInfo 领料任务info */ @Override + @Transactional public AjaxResult publish(LeaseApplyInfo leaseApplyInfo) { if (leaseApplyInfo.getId() == null) { return AjaxResult.error("ID为空,请完善后重新发布!"); @@ -150,16 +152,22 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { leaseApplyInfo.setUpdateTime(DateUtils.getNowDate()); leaseApplyInfo.setStatus(String.valueOf(PurchaseTaskStatusEnum.LEASE_TASK_PUBLISHED.getStatus())); - int result = leaseApplyInfoMapper.updateLeaseApplyInfo(leaseApplyInfo); - if (result > 0) { - // 同步修改tm_task任务状态 - TmTask tmTask = new TmTask(); - tmTask.setTaskId(leaseApplyInfo.getTaskId()); - tmTask.setStatus(String.valueOf(PurchaseTaskStatusEnum.LEASE_TASK_PUBLISHED.getStatus())); - tmTaskMapper.updateTmTask(tmTask); - return AjaxResult.success("发布成功"); - } else { + try { + int result = leaseApplyInfoMapper.updateLeaseApplyInfo(leaseApplyInfo); + if (result > 0) { + // 同步修改tm_task任务状态 + TmTask tmTask = new TmTask(); + tmTask.setTaskId(leaseApplyInfo.getTaskId()); + tmTask.setStatus(String.valueOf(PurchaseTaskStatusEnum.LEASE_TASK_PUBLISHED.getStatus())); + tmTaskMapper.updateTmTask(tmTask); + return AjaxResult.success("发布成功"); + } return AjaxResult.error("发布失败"); + } catch (DataAccessException e) { + // 抛出异常、回滚数据 + throw new RuntimeException(); + } catch (Exception e) { + return AjaxResult.error("发布失败:" + e.getMessage()); } }