[feat]销售订单: 修改审核时未能删除旧数据，新数据插入没有关联的销售单号，修该审核的<input name ="salesOrderCode" disable> disable改为readonly.

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,

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;
     }

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);
 }

ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesOrderChildService.java

@@ -27,4 +27,11 @@ public interface ISysSalesOrderChildService {
         *  通过销售订单号查询销售订单子表
         * */
         List<SysSalesOrderChild> selectOrderChildListBySalesOrderCode(String salesOrderCode);
+
+        /**
+         *  通过销售订单号修改销售订单子表 的删除标志
+         * @param salesOrderCode
+         * @return
+         */
+        Integer updateSysSalesOrderChildByQuoteId(String salesOrderCode);
 }

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);
+    }
 }

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<SysSalesOrderChild> sysSalesOrderChildList = sysSalesOrder.getSysSalesOrderChildList();
-            String[] ids = {sysSalesOrder.getSalesOrderCode()};
+            sysSalesOrderChildService.updateSysSalesOrderChildByQuoteId(sysSalesOrder.getSalesOrderCode());
-            sysSalesOrderChildService.deleteSysSalesOrderChildByQuoteIds(ids);
-            //获取已上传的销售订单物料报价信息
-           sysSalesOrderChildService.selectSysSalesOrderChildByQuoteId(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.setUpdateTime(DateUtils.getNowDate());
-               sysSalesOrderChild.setQuoteId(sysSalesOrder.getSalesOrderCode());
                sysSalesOrderChildService.insertSysSalesOrderChild(sysSalesOrderChild);
            }
         }

ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml

@@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="useStatus"            column="use_status"             />
         <result property="auditStatus"          column="audit_status"           />
         <result property="bomId"                column="bom_id"                 />
+        <result property="delFlag"              column="del_flag"               />
     </resultMap>
 
     <sql id="selectSysSalesOrderChild">
@@ -55,7 +56,7 @@ 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'
     </sql>
     <select id="selectSysSalesOrderChildList" parameterType="SysSalesOrderChild" resultMap="SysSalesOrderChildResult">
         <include refid="selectSysSalesOrderChild"/>
@@ -289,4 +290,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+    <update id="updateSysSalesOrderChildByQuoteId" parameterType="String">
+        update sys_sales_order_child set del_flag = '1' where quoteId = #{salesOrderCode}
+    </update>
 </mapper>

ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml

@@ -398,10 +398,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <delete id="deleteSysSalesOrderById" parameterType="Long">
-        update sys_sales_order set use_status = 1  where sales_order_id = #{salesOrderId}
+        update sys_sales_order set del_flag = '1'  where sales_order_id = #{salesOrderId}
     </delete>
     <delete id="deleteSysSalesOrderByIds" parameterType="String">
-        update sys_sales_order set use_status = 1 where sales_order_id in
+        update sys_sales_order set del_flag = '1' where sales_order_id in
         <foreach item="salesOrderId" collection="array" open="(" separator="," close=")">
             #{salesOrderId}
         </foreach>

ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html

@@ -51,13 +51,13 @@
         <div class="form-group" hidden="hidden">
             <label class="col-sm-3 control-label is-required">销售订单编号：</label>
             <div class="col-sm-8">
-                <input name="salesOrderCode" class="form-control" th:field="*{salesOrderCode}" type="text" required >
+                <input name="salesOrderCode" class="form-control" th:field="*{salesOrderCode}" type="text" required readonly>
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">客户ID：</label>
             <div class="col-sm-8">
-                <input id="enterpriseCode" name="enterpriseCode" class="form-control m-b" th:field="*{enterpriseCode}" required />
+                <input id="enterpriseCode" name="enterpriseCode" class="form-control m-b" th:field="*{enterpriseCode}" required readonly/>
             </div>
         </div>
         <div class="form-group">

ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html

@@ -49,7 +49,7 @@
         <div class="form-group" hidden="hidden">
             <label class="col-sm-3 control-label is-required">销售订单编号：</label>
             <div class="col-sm-8">
-                <input name="salesOrderCode" class="form-control" th:field="*{salesOrderCode}" type="text" required disabled>
+                <input name="salesOrderCode" class="form-control" th:field="*{salesOrderCode}" type="text" required readonly>
             </div>
         </div>
         <div class="form-group">

ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html

@@ -49,7 +49,7 @@
         <div class="form-group" hidden="hidden">
             <label class="col-sm-3 control-label is-required">销售订单编号：</label>
             <div class="col-sm-8">
-                <input name="salesOrderCode" class="form-control" th:field="*{salesOrderCode}" type="text" required disabled>
+                <input name="salesOrderCode" class="form-control" th:field="*{salesOrderCode}" type="text" required readonly>
             </div>
         </div>
         <div class="form-group">

ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html

@@ -49,7 +49,7 @@
         <div class="form-group" hidden="hidden">
             <label class="col-sm-3 control-label is-required">销售订单编号：</label>
             <div class="col-sm-8">
-                <input name="salesOrderCode" class="form-control" th:field="*{salesOrderCode}" type="text" required disabled>
+                <input name="salesOrderCode" class="form-control" th:field="*{salesOrderCode}" type="text" required readonly>
             </div>
         </div>
         <div class="form-group">