'销售啊'

src/main/java/com/steerinfo/dil/controller/AmsSaleOrderController.java

@@ -926,7 +926,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         return success(i);
     }
 
-    @ApiModelProperty(value = "新增钒渣销售订单")
+    @ApiModelProperty(value = "新增钒渣销售订单（未被使用，实际是走水渣的路线）")
     @PostMapping("/addVanadiumSaleOrder")
     public RESTfulResult addVanadiumSaleOrder(@RequestBody Map<String,Object> mapValue) {
         int result = amsSaleOrderService.addVanadiumSaleOrder(mapValue);
@@ -1215,14 +1215,20 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         String wholeOrder = "0";
         String status = "close";
         Map<String,Object> head = new HashMap<>();
+        // 销售订单号
         head.put("number",number);
+        // 关闭原因
         head.put("reason",reason);
+        // 金蝶分录
         head.put("closeEntryId",closeEntryId);
+        // 是否整单：（0：分录，1：整单）
         head.put("wholeOrder",wholeOrder);
+        // 物流销售订单分录主键
         head.put("closeWlEntryId",closeWlEntryId);
+        // 状态：close为关闭
         head.put("status",status);
         Map<String,Object> input = new HashMap<>();
-        Map<String, Object> totalMap = easTestUtil.getTotalMap();
+        Map<String, Object> totalMap = easUtil.getTotalMap();
         input.put("head",head);
         totalMap.put("input",input);
         // 调用金蝶关闭接口

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

@@ -29,4 +29,6 @@ public interface AmsSaleMaterialMapper extends IBaseMapper<AmsSaleMaterial, BigD
     int deleteWmspOutResult(Map<String, Object> mapValue);
     // 开启所有的分录
     int openAllSaleMaterial(BigDecimal saleOrderId);
+    // 反关闭分录
+    int adverseCloseSaleMaterial(BigDecimal saleMaterialId);
 }

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

@@ -814,6 +814,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     Map<String, Object> priceMap = priceList.get(0);
                     priceId = (BigDecimal) priceMap.get("priceId");
                 }
+                else {
+                    priceId = new BigDecimal(2400);
+                }
             }
             // 运输线路id
             BigDecimal lineId = DataChange.dataToBigDecimal(map.get("lineId"));
@@ -1629,9 +1632,13 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         String wholeOrder = "1";
         String status = "close";
         Map<String,Object> head = new HashMap<>();
+        // 销售订单号
         head.put("number",number);
+        // 关闭原因
         head.put("reason",reason);
+        // 是否整单
         head.put("wholeOrder",wholeOrder);
+        // 发送状态
         head.put("status",status);
         Map<String,Object> input = new HashMap<>();
         Map<String, Object> totalMap = easDeleteUtil.getTotalMap();
@@ -1725,9 +1732,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     public int closeSteelMaterialId(Map<String, Object> mapValue) {
         int result = 0;
         Object orderId = mapValue.get("orderId");
+        Integer orderStatus = (Integer) mapValue.get("orderStatus");
         BigDecimal saleOrderMaterialId = DataChange.dataToBigDecimal(mapValue.get("saleOrderMaterialId"));
-        List<Map<String,Object>> loadIdList =  amsSaleMaterialMapper.findLoadIdList(saleOrderMaterialId);
-        List<Map<String,Object>> weightIdList =  amsSaleMaterialMapper.findWeightIdList(saleOrderMaterialId);
+        List<Map<String, Object>> loadIdList = amsSaleMaterialMapper.findLoadIdList(saleOrderMaterialId);
+        List<Map<String, Object>> weightIdList = amsSaleMaterialMapper.findWeightIdList(saleOrderMaterialId);
         String reason = (String) mapValue.get("reason");
         BigDecimal saleMaterialId = DataChange.dataToBigDecimal(mapValue.get("saleMaterialId"));
         // 如果还未派车
@@ -1740,16 +1748,16 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             result += amsSaleMaterialMapper.updateByPrimaryKeySelective(amsSaleMaterial);
             return result;
         }
-        // 已派车
-        if (loadIdList == null || loadIdList.size() == 0) {
-            return result;
-        }
         // 订单子表设为关闭状态
         AmsSaleMaterial amsSaleMaterial = new AmsSaleMaterial();
         amsSaleMaterial.setSaleMaterialId(saleMaterialId);
         amsSaleMaterial.setDeleted(new BigDecimal(0));
         amsSaleMaterial.setInsertUpdateRemark(reason);
         result += amsSaleMaterialMapper.updateByPrimaryKeySelective(amsSaleMaterial);
+        // 已派车
+        if (loadIdList == null || loadIdList.size() == 0) {
+            return result;
+        }
         // 删除实绩表
         Map<String, Object> loadMap = loadIdList.get(0);
         Map<String, Object> weightMap = weightIdList.get(0);
@@ -1787,8 +1795,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         // unClose : 代表反关闭
         String status = "unClose";
         AmsSaleMaterial amsSaleMaterial = amsSaleMaterialMapper.selectByPrimaryKey(saleMaterialId);
-        amsSaleMaterial.setDeleted(null);
-        int result = amsSaleMaterialMapper.updateByPrimaryKeySelective(amsSaleMaterial);
+        int result = amsSaleMaterialMapper.adverseCloseSaleMaterial(saleMaterialId);
         AmsSaleOrder amsSaleOrder = amsSaleOrderMapper.selectByPrimaryKey(amsSaleMaterial.getSaleOrderId());
         // 根据分录id查询运单id，物资id，总实绩id
         Map<String,Object> saleMaterialMap = amsSaleOrderMapper.getSaleMaterialMessage(saleMaterialId);

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

@@ -510,7 +510,7 @@
            LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
                      ON TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
     WHERE OO.ORDER_TYPE = 1
-      AND OO.ORDER_STATUS IN (4, 5)
+      AND OO.ORDER_STATUS = 5
       AND TLR.MATERIAL_ID IS NULL
       AND OO.ORDER_PLAN_ID = #{saleOrderMaterialId}
     ORDER BY TLR.SEGMENT_SQE DESC
@@ -575,4 +575,10 @@
     WHERE ASM.SALE_ORDER_ID = #{saleOrderId}
   </update>
 
+  <update id="adverseCloseSaleMaterial" parameterType="DECIMAL">
+    UPDATE AMS_SALE_MATERIAL ASM
+    SET ASM.DELETED = NULL
+    WHERE ASM.SALE_MATERIAL_ID = #{saleMaterialId}
+  </update>
+
 </mapper>