From 3739bd2483d80848e483d22248cc805734f30801 Mon Sep 17 00:00:00 2001 From: zhangsiqi <2825463979@qq.com> Date: Mon, 22 Jul 2024 15:57:00 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95:=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A1=E6=A0=B8=E6=97=B6=E6=9C=AA=E8=83=BD?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A7=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8F=92=E5=85=A5=E6=B2=A1=E6=9C=89=E5=85=B3?= =?UTF-8?q?=E8=81=94=E7=9A=84=E9=94=80=E5=94=AE=E5=8D=95=E5=8F=B7=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E8=AF=A5=E5=AE=A1=E6=A0=B8=E7=9A=84=20disable=E6=94=B9=E4=B8=BAreado?= =?UTF-8?q?nly.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/SysSalesOrderController.java | 1 + .../com/ruoyi/system/domain/SysSalesOrderChild.java | 11 +++++++++++ .../system/mapper/SysSalesOrderChildMapper.java | 9 +++++++++ .../system/service/ISysSalesOrderChildService.java | 7 +++++++ .../service/impl/SysSalesOrderChildServiceImpl.java | 5 +++++ .../service/impl/SysSalesOrderServiceImpl.java | 12 ++++-------- .../mapper/system/SysSalesOrderChildMapper.xml | 8 ++++++-- .../resources/mapper/system/SysSalesOrderMapper.xml | 4 ++-- .../templates/system/salesOrder/taskModifyApply.html | 4 ++-- .../templates/system/salesOrder/taskYwjlVerify.html | 2 +- .../templates/system/salesOrder/taskYwzgVerify.html | 2 +- .../templates/system/salesOrder/taskZozjVerify.html | 2 +- 12 files changed, 50 insertions(+), 17 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java index 45a0289d..974ee591 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java @@ -431,6 +431,7 @@ public class SysSalesOrderController extends BaseController * @return */ @RequestMapping(value = "/complete/{taskId}", method = {RequestMethod.POST, RequestMethod.GET}) + @Transactional(rollbackFor = Exception.class) @ResponseBody public AjaxResult complete(@PathVariable("taskId") String taskId,@RequestParam(value = "saveEntity", required = false) String saveEntity, @RequestParam(value = "salesOrderChildList", required = false) String salesOrderChildList, diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrderChild.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrderChild.java index 7e1b9e7b..5c0eff1a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrderChild.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrderChild.java @@ -151,6 +151,17 @@ public class SysSalesOrderChild extends BaseEntity { private String bomId; + /**删除标志*/ + private String delFlag; + + public String getDelFlag() { + return delFlag; + } + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + public Long getId() { return id; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesOrderChildMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesOrderChildMapper.java index b1db1139..09b96859 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesOrderChildMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesOrderChildMapper.java @@ -1,6 +1,7 @@ package com.ruoyi.system.mapper; import com.ruoyi.system.domain.SysSalesOrderChild; +import io.swagger.models.auth.In; import org.apache.ibatis.annotations.Param; import org.mapstruct.Mapper; @@ -37,4 +38,12 @@ public interface SysSalesOrderChildMapper { * 根据销售单号和物料号更新销售单子表数据 * */ int updateSysSalesOrderChildByCodeAndQuoteId(SysSalesOrderChild sysSalesOrderChild); + + /** + * 根据销售单号设置为删除标志为 1删除 + * @param salesOrderCode + * @return + */ + + Integer updateSysSalesOrderChildByQuoteId(String salesOrderCode); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesOrderChildService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesOrderChildService.java index f87f3d25..4e710bc9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesOrderChildService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesOrderChildService.java @@ -27,4 +27,11 @@ public interface ISysSalesOrderChildService { * 通过销售订单号查询销售订单子表 * */ List selectOrderChildListBySalesOrderCode(String salesOrderCode); + + /** + * 通过销售订单号修改销售订单子表 的删除标志 + * @param salesOrderCode + * @return + */ + Integer updateSysSalesOrderChildByQuoteId(String salesOrderCode); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderChildServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderChildServiceImpl.java index 6a693507..fceb079b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderChildServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderChildServiceImpl.java @@ -60,4 +60,9 @@ public class SysSalesOrderChildServiceImpl implements ISysSalesOrderChildService return sysCustomerQuoteChildMapper.selectOrderChildListBySalesOrderCode(salesOrderCode); } + + @Override + public Integer updateSysSalesOrderChildByQuoteId(String salesOrderCode) { + return sysCustomerQuoteChildMapper.updateSysSalesOrderChildByQuoteId(salesOrderCode); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java index 60a24051..70458f90 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java @@ -208,26 +208,22 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService @Override public int updateSysSalesOrder(SysSalesOrderVo sysSalesOrder) { - SysUser user = userMapper.selectUserByLoginName(sysSalesOrder.getApplyUser()); String loginName = ShiroUtils.getLoginName(); sysSalesOrder.setUpdateBy(loginName); - sysSalesOrder.setUpdateTime(new Date()); + sysSalesOrder.setUpdateTime(DateUtils.getNowDate()); // 存在提交完就流程结束的情况 if(sysSalesOrder.getSysSalesOrderChildList().size() > 0){ //1.1.销售订单物料的前台上传新的报价列表，修改后台存在的报价猎豹，以报价编号为索引 //获取传输的销售订单物料报价信息 List sysSalesOrderChildList = sysSalesOrder.getSysSalesOrderChildList(); - String[] ids = {sysSalesOrder.getSalesOrderCode()}; - sysSalesOrderChildService.deleteSysSalesOrderChildByQuoteIds(ids); - //获取已上传的销售订单物料报价信息 - sysSalesOrderChildService.selectSysSalesOrderChildByQuoteId(sysSalesOrder.getSalesOrderCode()); + sysSalesOrderChildService.updateSysSalesOrderChildByQuoteId(sysSalesOrder.getSalesOrderCode()); for (int i = 0; i < sysSalesOrderChildList.size(); i++) { SysSalesOrderChild sysSalesOrderChild = sysSalesOrderChildList.get(i); sysSalesOrderChild.setQuoteId(sysSalesOrder.getSalesOrderCode()); sysSalesOrderChild.setCreateBy(loginName); + sysSalesOrderChild.setCreateTime(DateUtils.getNowDate()); sysSalesOrderChild.setUpdateBy(loginName); - sysSalesOrderChild.setUpdateTime(new Date()); - sysSalesOrderChild.setQuoteId(sysSalesOrder.getSalesOrderCode()); + sysSalesOrderChild.setUpdateTime(DateUtils.getNowDate()); sysSalesOrderChildService.insertSysSalesOrderChild(sysSalesOrderChild); } } diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml index 718ef843..caeca29a 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml @@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -55,11 +56,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ,b.id as bom_id from sys_sales_order_child a left join erp_bom b - on a.materialCode = b.material_no + on a.materialCode = b.material_no and b.del_flag = '0' +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html index 5e793120..f54d5eda 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html @@ -49,7 +49,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html index 4e1cc319..c32d861a 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html @@ -49,7 +49,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html index 4c186484..1fdccd42 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html @@ -49,7 +49,7 @@