diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java index 9390496..3560169 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java @@ -185,6 +185,17 @@ public class LeaseOutDetailsController extends BaseController { } } + /** + * 出库单修改出库时间 + * + * @param bean + */ + @Log(title = "出库单修改出库时间", businessType = BusinessType.UPDATE) + @PostMapping("/updateOutTime") + public AjaxResult updateOutTime(@RequestBody TmTask bean) { + return leaseOutDetailsService.updateOutTime(bean); + } + /** * 综合查询--领用记录查询 * @@ -217,4 +228,6 @@ public class LeaseOutDetailsController extends BaseController { } } + + } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyDetailsMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyDetailsMapper.java index 7e923a6..3b1efd6 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyDetailsMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyDetailsMapper.java @@ -57,4 +57,5 @@ public interface LeaseApplyDetailsMapper { List getOrderBody(@Param("parentId") String parentId,@Param("typeId") String typeId); List getLeaseApplyDetailsTypeCount(BackApplyInfo bean); + } \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java index 0d1198a..80f4bb7 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java @@ -109,4 +109,14 @@ public interface LeaseOutDetailsMapper { LeaseApplyDetails getLeaseApplyDetails(@Param("record") LeaseOutDetails record); int updateLeaseApplyDetails(@Param("record") LeaseOutDetails record); + + int updateOutTimeTmTask(TmTask bean); + + List getDetail(TmTask bean); + + int updateOutTimeDetails(TmTask bean); + + List getSlt(TmTask bean); + + int updateOutTimeSlt(TmTask bean); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java index e504382..6b63020 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java @@ -81,4 +81,6 @@ public interface LeaseOutDetailsService { TmTask getLeaseOutOrder(String parentId,String typeId); int delMachineByRfid(MaMachine maMachine); + + AjaxResult updateOutTime(TmTask bean); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java index be9fb17..5e592ee 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java @@ -160,6 +160,39 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { return orderHead; } + @Override + @Transactional + public AjaxResult updateOutTime(TmTask bean) { + try { + //修改tm_task表的出库时间 + int i = leaseOutDetailsMapper.updateOutTimeTmTask(bean); + if (i == 0) { + return AjaxResult.error("出库时间修改失败"); + } + List detailList = leaseOutDetailsMapper.getDetail(bean); + if(!detailList.isEmpty()){ + int j = leaseOutDetailsMapper.updateOutTimeDetails(bean); + if (j == 0) { + return AjaxResult.error("出库时间修改失败"); + } + } + + List sltList = leaseOutDetailsMapper.getSlt(bean); + if(!sltList.isEmpty()){ + int k = leaseOutDetailsMapper.updateOutTimeSlt(bean); + if (k == 0) { + return AjaxResult.error("出库时间修改失败"); + } + } + } catch (Exception e) { + log.error("出库时间修改成功", e.getMessage()); + throw new RuntimeException("出库时间修改成功"); + } + return AjaxResult.success("出库时间修改成功"); + } + + + @Override public int delMachineByRfid(MaMachine maMachine) { List maMachineByMaIdAndMaCode = maMachineMapper.getMaMachineByMaIdAndMaCode(maMachine); diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml index 4b1d9ea..605f09e 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml @@ -511,4 +511,51 @@ parennt_id = #{record.parentId} AND type_id = #{record.typeId} + + + + UPDATE + tm_task + SET + update_time = #{updateTime} + WHERE + task_id = #{taskId} + + + + + + + UPDATE + lease_out_details + SET + create_time = #{updateTime} + WHERE + parent_id = #{id} + + + + + + UPDATE + slt_agreement_info + SET + start_time = #{updateTime} + WHERE + lease_id = #{id} +