Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API

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

@@ -71,4 +71,6 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     String getOrderCapacityHistory(BigDecimal orderId);
 
+    int selectOutFactory(BigDecimal orderId);
+
 }

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

@@ -683,6 +683,7 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
             //物资数量
             omstruckOrderMaterial.setOrderMaterialNumber(materialNum);
             omstruckOrderMaterial.setInsertTime(new Date());
+            omstruckOrderMaterial.setSaleMaterialId(saleMaterialId);
             // 新增车序号-物资中间表
             result += amsSaleTrucknoMaterialMapper.insertSelective(amsSaleTrucknoMaterial);
             // 新增定向派单表

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

@@ -8,6 +8,7 @@ import com.steerinfo.dil.mapper.*;
 import com.steerinfo.dil.model.*;
 import com.steerinfo.dil.service.IAmsSaleOrderService;
 import com.steerinfo.dil.util.*;
+import com.steerinfo.framework.utils.base.StringUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -602,7 +603,12 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         String isSelfMention = (String) mapValue.get("isSelfMention");
         // 备注
         String saleRemark = (String) mapValue.get("saleRemark");
-
+        String saleGroupCode = null;
+        try {
+            saleGroupCode = "钢" + StringUtils.substringBetween(saleRemark,"钢","组") + "组";
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         // 收款客户
         String saleOrderReceiveCustomer = (String) mapValue.get("saleOrderReceiveCustomer");
         // 业务员
@@ -825,6 +831,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             } catch (Exception e) {
                 e.printStackTrace();
             }
+            if(saleGroupCode != null) {
+                amsSaleMaterial.setTransferOutOfWarehouse(saleGroupCode);
+            }
             amsSaleMaterial.setInsertTime(new Date());
             amsSaleMaterial.setUpdateTime(new Date());
             amsSaleMaterial.setIsPoundSale(isPoundSale);
@@ -2941,8 +2950,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     public int updateTransportOrderStatus(BigDecimal orderId) {
         //查询该运单下有没有净重,没有净重就变为7，有净重就变为2
         int netWeight = omstruckOrderMapper.selectNetWeightCount(orderId);
+        //查询该运单有没有出厂,没有出厂才变2
+        int outFactory = omstruckOrderMapper.selectOutFactory(orderId);
         int orderStatus = 7;
-        if(netWeight > 0) {
+        if(netWeight > 0 && outFactory == 0) {
             orderStatus = 2;
         }
         return amsSaleOrderMaterialMapper.updateTransportOrderStatus(orderId,orderStatus);

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

@@ -4534,7 +4534,6 @@
                         ASM.IS_POUND_SALE                                       "isPoundSale",
                         ASM.SALE_MATERIAL_ID                                    "saleMaterialId",
                         TPAR.RESULT_ID                                          "approveId"
-
                       FROM AMS_SALE_ORDER ASO
                         LEFT JOIN AMS_SALE_MATERIAL ASM
                       ON ASM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
@@ -4651,7 +4650,8 @@
 
     <update id="updateAMSDeleted">
     update AMS_SALE_MATERIAL ASM
-    set ASM.DELETED = 0
+    set ASM.DELETED = 0,
+        ASM.INSERT_UPDATE_REMARK = '继续装关闭分录'
     where ASM.SALE_MATERIAL_ID=#{closeWlEntryId}
   </update>
   <update id="updateOldSaleOrderUpload" parameterType="java.math.BigDecimal">

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

@@ -953,5 +953,12 @@
     <select id="getTelByCapacityId" resultType="java.lang.String">
         SELECT CAPACITY_TEL FROM RMS_CAPACITY WHERE CAPACITY_ID= #{capacityId}
     </select>
+    <select id="selectOutFactory" resultType="java.lang.Integer" parameterType="java.math.BigDecimal">
+        SELECT COUNT(TLFR.RESULT_ID) FROM TMSTRUCK_TOTAL_RESULT TTR
+        LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+        ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        WHERE TTR.ORDER_ID = #{orderId}
+        AND TLFR.RESULT_OUT_GATE_TIME IS NOT NULL
+    </select>
 
 </mapper>