tijiaoi

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

@@ -1504,6 +1504,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
 
     @ApiOperation("批量新增销售订单")
     @PostMapping("addSteelSaleOrderList")
+    @Transactional
     public RESTfulResult addSteelSaleOrderList(@RequestBody List<Map<String,Object>> mapList){
         int count = 0;
         String saleOrderNo = null;
@@ -1540,4 +1541,29 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         int result = amsSaleOrderService.getSaleOrderStatus(saleNumber);
         return success(result);
     }
+
+    @ApiOperation("批量新增未装销售订单")
+    @PostMapping("addUnloadSteelSaleOrderList")
+    public RESTfulResult addUnloadSteelSaleOrderList(@RequestBody List<Map<String,Object>> mapList){
+        int count = 0;
+        String saleOrderNo = null;
+        System.out.println("------销售订单批量导入Excel导入-----");
+        System.out.println(mapList);
+        System.out.println("------销售订单批量导入Excel导入-----");
+        try {
+            for (Map<String,Object> map:mapList
+            ) {
+                saleOrderNo = map.get("saleOrderNo").toString();
+                count++;
+                int saleOrderId= amsSaleOrderService.addSteelSaleOrder(map);
+                if (map.get("isUploadEas") != null && saleOrderId != 0) {
+                    amsSaleOrderService.uploadSaleOrder(new BigDecimal(saleOrderId));
+                }
+            }
+        } catch (Exception e) {
+            return failed("销售订单编号为:" + saleOrderNo + e.getMessage());
+        }
+        return success(count);
+    }
+
 }

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

@@ -36,4 +36,6 @@ public interface AmsSaleMaterialMapper extends IBaseMapper<AmsSaleMaterial, BigD
 
     int updateSaleMaterial(BigDecimal saleOrderMaterialId);
 
+    int getSaleMaterialDelete(BigDecimal saleOrderMaterialId);
+
 }

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

@@ -183,4 +183,9 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
     int updateSaleOrderStatus(String saleNumber);
 
     Integer getDispachSwitch();
+
+    Map<String, Object> getSteelOrderMap(BigDecimal saleOrderMaterialId);
+
+    int updateOldSaleOrderUpload(BigDecimal saleOrderId);
+
 }

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

@@ -64,4 +64,6 @@ public interface AmsSaleOrderMaterialMapper extends IBaseMapper<AmsSaleOrderMate
     //更新收货客户
     int updateInwardConsignee(Map<String, Object> mapValue);
 
+    int selectSaleOrderIdIsUpload(BigDecimal saleOrderId);
+
 }

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

@@ -48,4 +48,12 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     Map<String, Object> getSteelIsSpelling(BigDecimal orderId);
 
+    int getResultCount(BigDecimal orderId);
+
+    Integer getOrderStatus(BigDecimal orderId);
+
+    int getOrderMaterialNum(BigDecimal orderId);
+
+    int getWeightResultNum(BigDecimal orderId);
+
 }

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

@@ -18,4 +18,7 @@ public interface OmstruckOrderMaterialMapper extends IBaseMapper<OmstruckOrderMa
     BigDecimal selectMaxId();
 
     List<Map<String, Object>> getMaterialList(BigDecimal orderId);
+
+    int updateOmsMaterial(Map<String, Object> saleMaterialMap);
+
 }

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

@@ -540,6 +540,15 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     @Transactional(rollbackFor = Exception.class)
     public int addSteelSaleOrder(Map<String, Object> mapValue) throws Exception {
         List<Map<String,Object>> mapList = (List<Map<String, Object>>) mapValue.get("mapList");
+        //如果前端传输过来的销售订单id不是空,则改变为已上传
+        if (mapValue.get("saleOrderId") != null) {
+            //先判断该销售订单有没有被上传,如果传了则不允许重复上传
+            int count = amsSaleOrderMaterialMapper.selectSaleOrderIdIsUpload(DataChange.dataToBigDecimal(mapValue.get("saleOrderId")));
+            if(count != 0) {
+                return 0;
+            }
+             amsSaleOrderMapper.updateOldSaleOrderUpload(DataChange.dataToBigDecimal(mapValue.get("saleOrderId")));
+        }
         // 得到发货单位
         BigDecimal shipperId = DataChange.dataToBigDecimal(mapValue.get("shipperId"));
         // 收货单位
@@ -791,6 +800,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             amsSaleTrucknoMaterial.setInsertUpdateRemark("物流新增");
             result += amsSaleTrucknoMaterialMapper.insertSelective(amsSaleTrucknoMaterial);
         }
+
         result += amsSaleOrderMapper.insertSelective(amsSaleOrder);
         return saleOrderId.intValue();
     }
@@ -827,6 +837,11 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         Integer isCheckGps = amsSaleOrderMapper.getDispachSwitch();
         Integer saleStatus = amsSaleOrderMapper.findStatus(DataChange.dataToBigDecimal(stringObjectMap.get("saleOrderMaterialId")));
         String selfMention = amsSaleOrderMapper.findSelfMention(DataChange.dataToBigDecimal(stringObjectMap.get("saleOrderMaterialId")));
+        //如果这个车序号下面有运单,则证明已经派了
+        Map<String,Object> orderMap = amsSaleOrderMapper.getSteelOrderMap(DataChange.dataToBigDecimal(stringObjectMap.get("saleOrderMaterialId")));
+        if (orderMap != null) {
+            throw new Exception("该订单已派发,无法重复派车");
+        }
         if (saleStatus == 1) {
             throw new Exception("订单未审核，无法派车！");
         }
@@ -1007,7 +1022,11 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             // 调用websocket
             Map<String, Object> orderIdMap = new HashMap<>();
             orderIdMap.put("orderId", omstruckOrder.getOrderId());
-            amsSaleOrderMaterialService.pushMesToWebsocket(orderIdMap);
+            try {
+                amsSaleOrderMaterialService.pushMesToWebsocket(orderIdMap);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
             // 生成运输执行总实绩
             result += tmsTruckFeign.addTotalResult(orderIdMap);
         }
@@ -1890,7 +1909,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             //这是修改车牌号
             //将排队信息删掉
             Map<String, Object> isSpellingMap = omstruckOrderMapper.getSteelIsSpelling(DataChange.dataToBigDecimal(mapValue.get("orderId")));
-            if(isSpellingMap != null){
+            if(isSpellingMap != null && isSpellingMap.get("listId") != null){
                 int isSpelling = DataChange.dataToBigDecimal(isSpellingMap.get("isSpelling")).intValue();
                 if(isSpelling == 1){
                     result += omstruckOrderMapper.deleteSpellingList(isSpellingMap.get("listId"));
@@ -1992,25 +2011,39 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             result += amsSaleMaterialMapper.updateByPrimaryKeySelective(amsSaleMaterial);
             return result;
         }
+        orderStatus = omstruckOrderMapper.getOrderStatus(DataChange.dataToBigDecimal(orderId));
         // 订单子表设为关闭状态
         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) {
+        if ((loadIdList == null || loadIdList.size() == 0) && orderStatus == 5) {
             return result;
         }
-        // 删除实绩表
-        Map<String, Object> loadMap = loadIdList.get(0);
-        Map<String, Object> weightMap = weightIdList.get(0);
-        BigDecimal loadId = (BigDecimal) loadMap.get("loadId");
-        BigDecimal weightId = (BigDecimal) weightMap.get("weightId");
+        //判断关闭分录是否为最后一拼
+        int asmMaterialCount = amsSaleMaterialMapper.getSaleMaterialDelete(saleOrderMaterialId);
+        if (asmMaterialCount > 1 && orderStatus == 5) {
+                // 删除实绩表
+                Map<String, Object> loadMap = loadIdList.get(0);
+                Map<String, Object> weightMap = weightIdList.get(0);
+                BigDecimal loadId = (BigDecimal) loadMap.get("loadId");
+                BigDecimal weightId = (BigDecimal) weightMap.get("weightId");
+                result += amsSaleMaterialMapper.deleteLoadResult(loadId);
+                result += amsSaleMaterialMapper.deleteWeightResult(weightId);
+                result += amsSaleMaterialMapper.deleteWmspOutResult(mapValue);
+        }else{
+                //关闭运输订单
+                OmstruckOrder omstruckOrder = new OmstruckOrder();
+                omstruckOrder.setOrderId(DataChange.dataToBigDecimal(orderId));
+                //如果是单拼或者只剩一条分录没有关闭了则将状态设为7
+                omstruckOrder.setOrderStatus(new BigDecimal(7));
+                omstruckOrder.setUpdateTime(new Date());
+                omstruckOrder.setInsertUpdateRemark("关闭分录,同步关闭运输订单");
+                result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
+        }
+        result += amsSaleMaterialMapper.updateByPrimaryKeySelective(amsSaleMaterial);
         result += amsSaleMaterialMapper.updateOrderMaterialToClose(mapValue);
-        result += amsSaleMaterialMapper.deleteLoadResult(loadId);
-        result += amsSaleMaterialMapper.deleteWeightResult(weightId);
-        result += amsSaleMaterialMapper.deleteWmspOutResult(mapValue);
         return result;
     }
 
@@ -2045,34 +2078,36 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         Map<String,Object> saleMaterialMap = amsSaleOrderMapper.getSaleMaterialMessage(saleMaterialId);
         BigDecimal orderId = (BigDecimal) saleMaterialMap.get("orderId");
         BigDecimal orderStatus = (BigDecimal) saleMaterialMap.get("orderStatus");
-        if (orderId != null && orderStatus.intValue() == 5) {
+        //查询订单字表条数
+        int orderMaterialNum = omstruckOrderMapper.getOrderMaterialNum(orderId);
+        //查询计量实绩条数
+        int weightResultNum = omstruckOrderMapper.getWeightResultNum(orderId);
+        if (orderId != null && orderStatus.intValue() == 5 && orderMaterialNum != weightResultNum) {
             BigDecimal resultTotalId = (BigDecimal) saleMaterialMap.get("resultTotalId");
             BigDecimal materialId = (BigDecimal) saleMaterialMap.get("materialId");
             // 根据总实绩id查询订单中的最大路段顺序号
-            int maxNum = amsSaleOrderMapper.findOrderMaxNum(resultTotalId);
             // 得到皮重顺序号
-            int tareNum = maxNum - 3;
+            int tareNum = (weightResultNum + 1) * 3 - 1;
             // 得到装货顺序号
-            int loadNum = maxNum - 2;
+            int loadNum =  (weightResultNum + 1) * 3;
             // 得到毛重顺序号
-            int grossNum = maxNum - 1;
+            int grossNum = (weightResultNum + 1) * 3 + 1;
             // 装货实绩
             TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
             TmstruckWeightResult tmstruckWeightResult = new TmstruckWeightResult();
             tmstruckLoadResult.setResultId(tmstruckLoadResultMapper.selectMaxId());
             tmstruckLoadResult.setResultTotalId(resultTotalId);
-            tmstruckLoadResult.setMaterialId(materialId);
             tmstruckLoadResult.setSegmentSqe(new BigDecimal(loadNum));
             result += tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
             // 计量实绩
             tmstruckWeightResult.setWeightTaskResultId(tmstruckWeightResultMapper.selectMaxId());
             tmstruckWeightResult.setResultTotalId(resultTotalId);
-            tmstruckWeightResult.setMaterialId(materialId);
             tmstruckWeightResult.setResultTarePlaceId(new BigDecimal(10));
             tmstruckWeightResult.setResultGrossPlaceId(new BigDecimal(2));
             tmstruckWeightResult.setGrossSegmentSqe(new BigDecimal(grossNum));
             tmstruckWeightResult.setTareSegmentSqe(new BigDecimal(tareNum));
             result += tmstruckWeightResultMapper.insertSelective(tmstruckWeightResult);
+
             // 出库子表
             BigDecimal outBoundId = (BigDecimal) saleMaterialMap.get("outBoundId");
             BigDecimal materialNumber = (BigDecimal) saleMaterialMap.get("materialNumber");
@@ -2089,6 +2124,27 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 result += wmspOutboundResultMaterialMapper.insertSelective(wmspOutboundResultMaterial);
             }
         }
+        //去掉取消装货
+        result += omstruckOrderMaterialMapper.updateOmsMaterial(saleMaterialMap);
+        if (orderId != null && orderStatus.intValue() == 7) {
+            //如果订单被关闭,那么还原
+            //判断下面有没有实绩
+            int resultCount = omstruckOrderMapper.getResultCount(orderId);
+            OmstruckOrder omstruckOrder = new OmstruckOrder();
+            if (resultCount == 0) {
+                omstruckOrder.setOrderId(orderId);
+                omstruckOrder.setOrderStatus(new BigDecimal(4));
+                omstruckOrder.setInsertUpdateRemark("反关闭分录,运单同步开启");
+                omstruckOrder.setUpdateTime(new Date());
+                omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
+            }else{
+                omstruckOrder.setOrderId(orderId);
+                omstruckOrder.setOrderStatus(new BigDecimal(5));
+                omstruckOrder.setInsertUpdateRemark("反关闭分录,运单同步开启");
+                omstruckOrder.setUpdateTime(new Date());
+                omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
+            }
+        }
         // 设置反关闭分录id
         head.put("unCloseEntryId",amsSaleMaterial.getEasPrimaryId());
         // 设置是否整单

src/main/resources/application-prod.yml

@@ -19,7 +19,7 @@ openfeign:
    ImFeign:
       url: ${IMFEIGN_URL:172.16.33.166:8055}
    JoinFeign:
-     url: ${JOINFEIGN_URL:172.16.33.166:8066}
+     url: ${JOINFEIGN_URL:localhost:8066}
    OTMSFeign:
      url: ${OTMSFEIGN_URL:172.16.33.166:8038}
  #正式环境端口

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

@@ -678,9 +678,10 @@
     </select>
 
     <select id="isDispatchExist" parameterType="DECIMAL" resultType="DECIMAL" >
-        SELECT ADSO.DISPATCH_ID AS "dispatchId"
+        SELECT   ADSO.DISPATCH_ID AS "dispatchId"
         FROM AMS_DISPATCH_SALE_ORDER ADSO
         WHERE ADSO.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
+
     </select>
     
     <select id="queryFormatCount" resultType="java.lang.Integer">

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

@@ -502,7 +502,7 @@
     WHERE RM.MATERIAL_ID = #{materialId}
   </select>
   
-  <select id="findLoadIdList" parameterType="DECIMAL" resultType="java.util.Map">
+  <select id="findLoadIdList" parameterType="DECIMAL" resultType="java.util.LinkedHashMap">
     SELECT TLR.RESULT_ID AS "loadId"
     FROM OMSTRUCK_ORDER OO
            LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
@@ -516,7 +516,7 @@
     ORDER BY TLR.SEGMENT_SQE DESC
   </select>
 
-  <select id="findWeightIdList" parameterType="DECIMAL" resultType="java.util.Map">
+  <select id="findWeightIdList" parameterType="DECIMAL" resultType="java.util.LinkedHashMap">
     SELECT TWR.WEIGHT_TASK_RESULT_ID AS "weightId"
     FROM OMSTRUCK_ORDER OO
            LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
@@ -596,4 +596,13 @@
     ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
     WHERE TTR.ORDER_ID = #{orderId}
   </select>
+    <select id="getSaleMaterialDelete" resultType="java.lang.Integer">
+      SELECT count(asm.SALE_MATERIAL_ID) FROM AMS_SALE_ORDER_MATERIAL ASOM
+      LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+      ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+      LEFT JOIN AMS_SALE_MATERIAL ASM
+      ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+      WHERE ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
+      and ASM.DELETED is null
+    </select>
 </mapper>

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

@@ -4494,7 +4494,7 @@
   </select>
 
   <select id="findOrderMaxNum" parameterType="DECIMAL" resultType="java.lang.Integer" >
-    SELECT TLFR.SEGMENT_SQE "maxNum"
+    SELECT MAx(TLFR.SEGMENT_SQE)
     FROM TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
     WHERE TLFR.RESULT_TOTAL_ID = #{resultTotalId}
   </select>
@@ -4627,10 +4627,20 @@
     SELECT IS_OK "isOk" FROM AMS_DISPATCH_SWITCH
     fetch NEXT 1 rows only
   </select>
+    <select id="getSteelOrderMap" resultType="java.util.Map" parameterType="java.math.BigDecimal">
+      SELECT OO.ORDER_ID FROM OMSTRUCK_ORDER OO
+      WHERE OO.ORDER_PLAN_ID = #{saleOrderMaterialId}
+      AND OO.ORDER_TYPE = 1
+    </select>
 
-  <update id="updateAMSDeleted">
+    <update id="updateAMSDeleted">
     update AMS_SALE_MATERIAL ASM
     set ASM.DELETED = 0
     where ASM.SALE_MATERIAL_ID=#{closeWlEntryId}
   </update>
+  <update id="updateOldSaleOrderUpload" parameterType="java.math.BigDecimal">
+    update AMS_SALE_ORDER ASO
+    SET ASO.INSERT_UPDATE_REMARK = '物流上传金蝶成功'
+    WHERE ASO.SALE_ORDER_ID = #{saleOrderId}
+  </update>
 </mapper>

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

@@ -848,6 +848,7 @@
     SELECT RC.CAPACITY_ID AS "capacityId"
     FROM RMS_CAPACITY RC
     WHERE RC.CAPACITY_NUMBER = #{capacityNumber}
+
   </select>
 
   <!-- 查询销售订单中的总重量 -->
@@ -911,8 +912,15 @@
     WHERE ASTM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
             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
+      WHERE
+      ASO.INSERT_UPDATE_REMARK = '物流上传金蝶成功'
+      AND
+      ASO.SALE_ORDER_ID = #{saleOrderId}
+    </select>
 
-  <update id="updateSendStation">
+    <update id="updateSendStation">
     update
       TMSTRAIN_PLEASE_APPROVE_RESULT
     set SEND_STATION_ID=#{sendStationId}

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

@@ -904,4 +904,23 @@
         delete from QMS_QUEUE_LIST QQL
         where qql.LIST_ID = #{listId}
     </delete>
+    <select id="getResultCount" resultType="java.lang.Integer" parameterType="java.math.BigDecimal">
+        SELECT count(TER.RESULT_ID) FROM TMSTRUCK_TOTAL_RESULT TTR
+        LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+        ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        WHERE TTR.ORDER_ID = #{orderId}
+    </select>
+    <select id="getOrderStatus" resultType="java.lang.Integer" parameterType="java.math.BigDecimal">
+        SELECT ORDER_STATUS FROM OMSTRUCK_ORDER WHERE ORDER_ID = #{orderId}
+    </select>
+    <select id="getOrderMaterialNum" resultType="java.lang.Integer" parameterType="java.math.BigDecimal">
+        SELECT count(oom.ORDER_MATERIAL_ID) FROM OMSTRUCK_ORDER_MATERIAL OOM
+        WHERE OOM.ORDER_ID = #{orderId}
+    </select>
+    <select id="getWeightResultNum" resultType="java.lang.Integer" parameterType="java.math.BigDecimal">
+        SELECT COUNT(TWR.WEIGHT_TASK_RESULT_ID)  FROM TMSTRUCK_TOTAL_RESULT TTR
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+        ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        WHERE TTR.ORDER_ID = #{orderId}
+    </select>
 </mapper>

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

@@ -437,7 +437,8 @@
       #{item.orderMaterialId,jdbcType=DECIMAL}
     </foreach>
   </update>
-  <delete id="batchDelete" parameterType="java.util.List">
+
+    <delete id="batchDelete" parameterType="java.util.List">
     delete from OMSTRUCK_ORDER_MATERIAL
     where ORDER_MATERIAL_ID in
     <foreach close=")" collection="list" item="id" open="(" separator=",">
@@ -456,4 +457,12 @@
     FROM OMSTRUCK_ORDER_MATERIAL OOM
     WHERE OOM.ORDER_ID = #{orderId}
   </select>
+  <update id="updateOmsMaterial">
+    UPDATE OMSTRUCK_ORDER_MATERIAL OOM
+    SET OOM.MATERIAL_PRIORITY = NULL
+    WHERE
+    OOM.MATERIAL_ID = #{materialId}
+    and
+    OOM.ORDER_ID = #{orderId}
+  </update>
 </mapper>