修改

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

@@ -359,10 +359,19 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             }
         }
         if (orderStatus.equals("4") && closeStatus.equals("1")){
+
             AmsSaleOrder amsSaleOrder = amsSaleOrders.get(0);
             amsSaleOrder.setSaleOrderStatus(new BigDecimal(4));
             amsSaleOrder.setDeleted(new BigDecimal(0));
             amsSaleOrder.setUpdateTime(new Date());
+            Object saleRemark =  mapVal.get("saleRemark");
+            try {
+                if(saleRemark != null) {
+                    amsSaleOrder.setSaleRemark((String) saleRemark);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
             result += amsSaleOrderMapper.updateByPrimaryKeySelective(amsSaleOrder);
             BigDecimal saleOrderId = amsSaleOrder.getSaleOrderId();
             try {

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

@@ -1537,13 +1537,13 @@
         AND
         TWR.RESULT_TOTAL_ID = #{resultTotalId}
     </update>
-    <update id="updateMakeDate">
+    <update id="updateMakeDate" parameterType="decimal">
         UPDATE AMS_SALE_MATERIAL ASM
         SET ASM.SALE_MAKE_DATE = NULL
-        WHERE 1 != 1
-        <if test="saleMaterialId != null">
-            or ASM.SALE_MATERIAL_ID = #{saleMaterialId}
-        </if>
+        WHERE
+
+     ASM.SALE_MATERIAL_ID = #{saleMaterialId}
+
 
     </update>
 </mapper>