修改

src/main/java/com/steerinfo/dil/mapper/AmsSaleOrderMapper.java

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -216,4 +217,6 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
 
     int updateOldSaleOrderUploadByNo(String saleOrderNo);
 
+    Date getSaleOrderTime(BigDecimal saleOrderId);
+
 }

src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderMaterialServiceImpl.java

@@ -12,6 +12,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -484,6 +486,13 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
 
             // 订单类型
             omstruckOrder.setOrderType(status);
+            try {
+                if(map.get("userName") != null) {
+                    omstruckOrder.setOptionerCode(map.get("userName").toString());
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
             // 运输线路id
             omstruckOrder.setLineId(lineId);
             omstruckOrder.setInsertTime(new Date());
@@ -565,6 +574,20 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
         amsSaleOrderMaterial.setSaleOrderMaterialTruckNo(new BigDecimal(count));
         // 下发状态
         amsSaleOrderMaterial.setIssueStatus(new BigDecimal(2));
+        //给截止日期
+        //根据销售订单ID查询销售订单的新增时间
+        try {
+            Date saleOrderInsertTime = amsSaleOrderMapper.getSaleOrderTime(saleOrderId);
+            Calendar calendar=Calendar.getInstance();
+            calendar.setTime(saleOrderInsertTime);
+            calendar.add(Calendar.DATE,1);
+            SimpleDateFormat sdfDate = new SimpleDateFormat("yyyy-MM-dd");
+            String receiptDate = sdfDate.format(saleOrderInsertTime) + " 07:59:59";
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            amsSaleOrderMaterial.setSaleDateOfReceipt(sdf.parse(receiptDate));
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
         // 新增车序号表
         result += amsSaleOrderMaterialMapper.insertSelective(amsSaleOrderMaterial);
         String capacityNumber = "";

src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -1081,6 +1081,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 BigDecimal materialWeight = (BigDecimal) materialMap.get("materialWeight");
                 BigDecimal materialNumber = (BigDecimal) materialMap.get("materialNumber");
                 BigDecimal saleMaterialId = (BigDecimal) materialMap.get("saleMaterialId");
+
                 /*
                 运输订单物资子表
                 */
@@ -1097,6 +1098,14 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 // 物资件数
                 omstruckOrderMaterial.setOrderMaterialNumber(materialNumber);
                 omstruckOrderMaterial.setSaleMaterialId(saleMaterialId);
+                try {
+                    BigDecimal deleted = (BigDecimal) materialMap.get("DELETED");
+                    if(deleted != null) {
+                        omstruckOrderMaterial.setMaterialPriority(new BigDecimal(71));
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
                 // 新增运输订单子表
                 result += omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
             }
@@ -1258,6 +1267,14 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 // 物资件数
                 omstruckOrderMaterial.setOrderMaterialNumber(materialNumber);
                 omstruckOrderMaterial.setSaleMaterialId(saleMaterialId);
+                try {
+                    BigDecimal deleted = (BigDecimal) materialMap.get("DELETED");
+                    if(deleted != null) {
+                        omstruckOrderMaterial.setMaterialPriority(new BigDecimal(71));
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
                 // 新增运输订单子表
                 result += omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
             }
@@ -3362,6 +3379,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             BigDecimal materialWeight = (BigDecimal) materialMap.get("materialWeight");
             BigDecimal materialNumber = (BigDecimal) materialMap.get("materialNumber");
             BigDecimal saleMaterialId = (BigDecimal) materialMap.get("saleMaterialId");
+
             /*
             运输订单物资子表
             */
@@ -3378,6 +3396,14 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             // 物资件数
             omstruckOrderMaterial.setOrderMaterialNumber(materialNumber);
             omstruckOrderMaterial.setSaleMaterialId(saleMaterialId);
+            try {
+                BigDecimal deleted = (BigDecimal) materialMap.get("DELETED");
+                if(deleted != null) {
+                    omstruckOrderMaterial.setMaterialPriority(new BigDecimal(71));
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
             // 新增运输订单子表
             result += omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
         }

src/main/resources/com/steerinfo/dil/mapper/AmsSaleOrderMapper.xml

@@ -4959,5 +4959,9 @@
       AND TLFR.RESULT_OUT_GATE_TIME IS NOT NULL
       ORDER BY OO.ORDER_ID DESC
   </select>
+  <select id="getSaleOrderTime" resultType="java.util.Date" parameterType="decimal">
+    SELECT INSERT_TIME FROM AMS_SALE_ORDER
+    WHERE SALE_ORDER_ID = #{saleOrderId}
+  </select>
 
 </mapper>

src/main/resources/com/steerinfo/dil/mapper/AmsSaleOrderMaterialMapper.xml

@@ -922,13 +922,13 @@
     SELECT ASM.MATERIAL_ID     AS "materialId",
            ASM.MATERIAL_WEIGHT AS "materialWeight",
            ASM.MATERIAL_NUMBER AS "materialNumber",
-           ASM.SALE_MATERIAL_ID AS "saleMaterialId"
+           ASM.SALE_MATERIAL_ID AS "saleMaterialId",
+           ASM.DELETED  AS "DELETED"
     FROM AMS_SALE_TRUCKNO_MATERIAL ASTM
            LEFT JOIN AMS_SALE_MATERIAL ASM
                      ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
     WHERE ASTM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
-
-            AND ASM.SALE_MATERIAL_ID IS NOT NULL
+    AND ASM.SALE_MATERIAL_ID IS NOT NULL
   </select>
     <select id="selectSaleOrderIdIsUpload" resultType="java.lang.Integer" parameterType="java.math.BigDecimal">
       SELECT COUNT(aso.SALE_ORDER_ID) FROM AMS_SALE_ORDER ASO