解决冲突

ruoyi-admin/src/main/resources/templates/manage/order/add.html

@@ -106,7 +106,7 @@
         </div>
         <div class="col-sm-6">
             <div class="form-group">
-                <label class="col-sm-4 control-label is-required"> 客户名称：</label>
+                <label class="col-sm-4 control-label is-required"> 最终客户名称：</label>
                 <div class="col-sm-8">
                     <div class="input-group">
                         <input name="customerName" class="form-control" type="text" required

ruoyi-admin/src/main/resources/templates/manage/order/edit.html

@@ -107,7 +107,7 @@
 
         <div class="col-sm-6">
             <div class="form-group">
-                <label class="col-sm-4 control-label is-required">客户名称：</label>
+                <label class="col-sm-4 control-label is-required">最终客户名称：</label>
                 <div class="col-sm-8">
                     <div class="input-group">
                         <input name="customerName" th:field="*{customerName}" class="form-control" type="text"

ruoyi-admin/src/main/resources/templates/manage/order/order.html

@@ -19,7 +19,7 @@
                                 <input type="text" name="orderName"/>
                             </li>
                             <li>
-                                <label>客户名称：</label>
+                                <label>最终客户名称：</label>
                                 <input type="text" name="customerName"/>
                             </li>
                             <li>
@@ -94,7 +94,7 @@
                 },
                 {
                     field: 'customerName',
-                    title: '客户名称'
+                    title: '最终客户名称'
                 },
                 {
                     field: 'orderType',

ruoyi-admin/src/main/resources/templates/project/order/order.html

@@ -15,7 +15,7 @@
                                 <input type="text" name="projectId" placeholder="项目编号/项目名称/项目负责人" />
                             </li>
                             <li>
-                                <label>省市：</label>
+                                <label>地市：</label>
                                 <input type="text" name="city"/>
                             </li>
                             <li>
@@ -34,6 +34,62 @@
                                 <label>合同编号：</label>
                                 <input type="text" name="orderCode"/>
                             </li>
+                            <li>
+                                <label>出货金额：</label>
+                                <input type="text" name="shipmentAmount"/>
+                            </li>
+                            <li>
+                                <label>实际进货金额：</label>
+                                <input type="text" name="actualPurchaseAmount"/>
+                            </li>
+                            <li>
+                                <label>执行单有效截止时间：</label>
+                                <input type="text" class="time-input" placeholder="请选择执行单有效截止时间" name="orderEndTime"/>
+                            </li>
+                            <li>
+                                <label>要求到货时间：</label>
+                                <input type="text" class="time-input" placeholder="请选择要求到货时间" name="deliveryTime"/>
+                            </li>
+                            <li>
+                                <label>公司直发：</label>
+                                <input type="text" name="companyDelivery"/>
+                            </li>
+                            <li>
+                                <label>通知人：</label>
+                                <input type="text" name="notifier"/>
+                            </li>
+                            <li>
+                                <label>通知人邮箱：</label>
+                                <input type="text" name="notifierEmail"/>
+                            </li>
+                            <li>
+                                <label>通知人电话：</label>
+                                <input type="text" name="notifierPhone"/>
+                            </li>
+                            <li>
+                                <label>责任人：</label>
+                                <input type="text" name="duty"/>
+                            </li>
+                            <li>
+                                <label>责任人邮箱：</label>
+                                <input type="text" name="dutyEmail"/>
+                            </li>
+                            <li>
+                                <label>责任人电话：</label>
+                                <input type="text" name="dutyPhone"/>
+                            </li>
+                            <li>
+                                <label>下单通路：</label>
+                                <input type="text" name="orderChannel"/>
+                            </li>
+                            <li>
+                                <label>进货商：</label>
+                                <input type="text" name="partnerCode"/>
+                            </li>
+                            <li>
+                                <label>供货商：</label>
+                                <input type="text" name="supplier"/>
+                            </li>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>

ruoyi-admin/src/main/resources/templates/system/customer/add.html

@@ -17,7 +17,7 @@
         </div>
         <div class="col-xs-6">
             <div class="form-group">
-                <label class="col-sm-4 control-label">客户名称：</label>
+                <label class="col-sm-4 control-label">最终客户名称：</label>
                 <div class="col-sm-8">
                     <input name="customerName" class="form-control" type="text">
                 </div>

ruoyi-admin/src/main/resources/templates/system/customer/edit.html

@@ -18,7 +18,7 @@
             </div>
             <div class="col-xs-6">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label">客户名称：</label>
+                    <label class="col-sm-4 control-label">最终客户名称：</label>
                     <div class="col-sm-8">
                         <input name="customerName" th:field="*{customerName}" class="form-control" type="text">
                     </div>

ruoyi-admin/src/main/resources/templates/system/customer/info.html

@@ -15,7 +15,7 @@
                             <input type="text" name="customerCode"/>
                         </li>
                         <li>
-                            <label>客户名称：</label>
+                            <label>最终客户名称：</label>
                             <input type="text" name="customerName"/>
                         </li>
                         <li>
@@ -101,7 +101,7 @@
                 },
                 {
                     field: 'customerName',
-                    title: '客户名称'
+                    title: '最终客户名称'
                 },
                 {
                     field: 'customerPostcode',

ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/DeliveryListMapper.java

@@ -68,4 +68,6 @@ public interface DeliveryListMapper
     List<DeliveryInfoVo> listNumberInfo(ApiDataQueryDto dto);
 
     void deleteDeliveryListByDeliveryId(Long deliveryId);
+
+    void deleteDeliveryListByDeliveryIds(String[] strArray);
 }

ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderDeliveryServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ShiroUtils;
 import com.ruoyi.sip.domain.CodeGenTable;
+import com.ruoyi.sip.mapper.DeliveryListMapper;
 import com.ruoyi.sip.service.ICodeGenTableService;
 import com.ruoyi.sip.utils.CodeGeneratorUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +14,9 @@ import com.ruoyi.sip.mapper.OrderDeliveryMapper;
 import com.ruoyi.sip.domain.OrderDelivery;
 import com.ruoyi.sip.service.IOrderDeliveryService;
 import com.ruoyi.common.core.text.Convert;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
 
 /**
  * 发货记录Service业务层处理
@@ -25,6 +29,8 @@ public class OrderDeliveryServiceImpl implements IOrderDeliveryService
 {
     @Autowired
     private OrderDeliveryMapper orderDeliveryMapper;
+    @Resource
+    private DeliveryListMapper deliveryListMapper;
 
     @Autowired
     private ICodeGenTableService codeGenTableService;
@@ -87,8 +93,10 @@ public class OrderDeliveryServiceImpl implements IOrderDeliveryService
      * @return 结果
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public int deleteOrderDeliveryByIds(String ids)
     {
+        deliveryListMapper.deleteDeliveryListByDeliveryIds(Convert.toStrArray(ids));
         return orderDeliveryMapper.deleteOrderDeliveryByIds(Convert.toStrArray(ids));
     }
 

ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java

@@ -11,6 +11,7 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.sip.domain.*;
 import com.ruoyi.sip.mapper.ProjectInfoMapper;
 import com.ruoyi.sip.service.*;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -30,6 +31,7 @@ import java.util.stream.Stream;
  * @author ruoyi
  * @date 2025-05-29
  */
+@Slf4j
 @Service
 @Transactional(rollbackFor = Exception.class)
 public class ProjectInfoServiceImpl implements IProjectInfoService {
@@ -321,13 +323,11 @@ public class ProjectInfoServiceImpl implements IProjectInfoService {
 
     private int compareField(StringBuilder logContent, int index, String fieldName, Object oldValue, Object newValue) {
         if (!Objects.equals(oldValue, newValue)) {
-            logContent.append(index).append(".")
+            logContent.append(StringUtils.format("{}.{}由[{}]变更为[{}]\n",
-                    .append(fieldName)
+                    index,
-                    .append("由‘")
+                    fieldName,
-                    .append(oldValue == null ? "" : oldValue)
+                    oldValue == null ? "空" : oldValue,
-                    .append("’变更为‘")
+                    newValue == null ? "空" : oldValue));
-                    .append(newValue == null ? "" : oldValue)
-                    .append("’\n");
             index++;
         }
         return index;

ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml

@@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select t1.id, t1.delivery_id, t1.product_code, t1.serial_number, t1.remark, t1.created_at, t1.updated_at, t1.deleted_at
         ,t2.delivery_code
         from delivery_list t1
-        left join order_delivery t2 on t1.delivery_id=t2.id
+        inner join order_delivery t2 on (t1.delivery_id=t2.id and t2.status=0)
         where t1.serial_number in
         <foreach item="item" index="index" collection="list"
                  open="(" separator="," close=")">
@@ -149,5 +149,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <delete id="deleteDeliveryListByDeliveryId">
         delete from delivery_list where delivery_id = #{deliveryId}
     </delete>
+    <delete id="deleteDeliveryListByDeliveryIds">
+        delete from delivery_list where delivery_id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
 
 </mapper>