修改

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

@@ -998,6 +998,9 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
     @Override
     @Transactional
     public int mergeOrder(Map<String, Object> map) {
+        System.out.println(new Date() + "-----------");
+        System.out.println(map);
+        System.out.println(new Date() + "-----------");
         int i = 0 ;
         List<Map<String,Object>> mapList = (List<Map<String,Object>>)map.get("mapList");
         BigDecimal toMergeSaleOrderMaterialID = DataChange.dataToBigDecimal(mapList.get(0).get("saleOrderMaterialId"));
@@ -1017,6 +1020,7 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
                 AmsSaleTrucknoMaterial amsSaleTrucknoMaterial = new AmsSaleTrucknoMaterial();
                 amsSaleTrucknoMaterial.setTrucknoMaterialId(truckNoMaterialId);
                 amsSaleTrucknoMaterial.setSaleOrderMaterialId(toMergeSaleOrderMaterialID);
+                amsSaleTrucknoMaterial.setUpdateTime(new Date());
                 amsSaleTrucknoMaterial.setInsertUpdateRemark("执行合并操作,原车序号ID为" + saleOrderMaterialId);
                 i += amsSaleTrucknoMaterialMapper.updateByPrimaryKeySelective(amsSaleTrucknoMaterial);
             }
@@ -1025,6 +1029,7 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
                 amsSaleMaterial.setSaleMaterialId(saleMaterialId);
                 amsSaleMaterial.setSaleOrderId(saleOrderId);
                 amsSaleMaterial.setInsertUpdateRemark("执行合并操作,原销售订单号为" + saleOrderId);
+                amsSaleMaterial.setUpdateTime(new Date());
                 i += amsSaleMaterialMapper.updateByPrimaryKeySelective(amsSaleMaterial);
             }
         }
@@ -1035,6 +1040,9 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
     @Override
     @Transactional
     public int splitOrder(Map<String, Object> map) {
+        System.out.println(new Date() + "-----------");
+        System.out.println(map);
+        System.out.println(new Date() + "-----------");
         int i = 0;
         List<Map<String,Object>> mapList = (List<Map<String,Object>>)map.get("mapList");
         BigDecimal toSplitSaleOrderMaterialID = DataChange.dataToBigDecimal(mapList.get(0).get("saleOrderMaterialId"));

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

@@ -1393,6 +1393,7 @@
         WHERE AIR.PURCHASE_ORDER_ID IS NOT NULL
         AND AIR.REQUIREMENT_STATUS = #{requirementStatus}
         AND AIR.DELETED = 0
+        AND APO.DELETED = 0
         <if test="userId != null">
             and air.insert_username = #{userId}
         </if>