测通内转达州到厂内

src/main/java/com/steerinfo/dil/model/TmstruckLoadResult.java

@@ -129,6 +129,12 @@ public class TmstruckLoadResult implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="装车顺序",required=false)
     private BigDecimal loadingSequence;
 
+    /**
+     * 是否需要质检（0 ：不需要   1：需要）(ISDEDUCT,DECIMAL,0)
+     */
+    @ApiModelProperty(value="是否需要质检（0 ：不需要   1：需要）",required=false)
+    private BigDecimal isdeduct;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -301,6 +307,14 @@ public class TmstruckLoadResult implements IBasePO<BigDecimal> {
         this.loadingSequence = loadingSequence;
     }
 
+    public BigDecimal getIsdeduct() {
+        return isdeduct;
+    }
+
+    public void setIsdeduct(BigDecimal isdeduct) {
+        this.isdeduct = isdeduct;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -327,6 +341,7 @@ public class TmstruckLoadResult implements IBasePO<BigDecimal> {
         sb.append(", loadingId=").append(loadingId);
         sb.append(", materialId=").append(materialId);
         sb.append(", loadingSequence=").append(loadingSequence);
+        sb.append(", isdeduct=").append(isdeduct);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -188,7 +188,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
                 //计算计毛汽车衡并更新计量实绩 (暂时无法计算汽车衡)  需要写一个单独的方法 先计皮再计毛的
                 map.put("grossPlaceId", 3);
                 i += tmstruckWeightResultService.updateWeightResult(map);
-                i += tmstruckMeasureCommissionService.addMaoMeasureCommission(map); //添加计毛委托 并发送计毛委托
+//                i += tmstruckMeasureCommissionService.addMaoMeasureCommission(map); //添加计毛委托 并发送计毛委托
                 break;
             case 10: // 采购内转（老区-厂内） 没有进厂
                 break;

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

@@ -154,17 +154,16 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             case 6:
             case 7:
             case 8:
+            case 9:
                 i += utilsService.updateOrderStatus(map, 2); // 修改运输订单状态 2：已结束
 //                i += utilsService.updateCapacityStatus(map, 0); //修改运力状态 0：空闲中
                 //采购出厂 通过feign调用新增详单
-                try {
-                    bmsShipFeign.addDetailsOrder(DataChange.dataToBigDecimal(map.get("resultId"))); // 出厂实绩Id
-                    bmsTruckFeign.addDetailsOrder(DataChange.dataToBigDecimal(map.get("orderId")));  // 运单ID
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                break;
-            case 9:
+//                try {
+//                    bmsShipFeign.addDetailsOrder(DataChange.dataToBigDecimal(map.get("resultId"))); // 出厂实绩Id
+//                    bmsTruckFeign.addDetailsOrder(DataChange.dataToBigDecimal(map.get("orderId")));  // 运单ID
+//                } catch (Exception e) {
+//                    e.printStackTrace();
+//                }
                 break;
             case 10:
                 break;

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

@@ -92,7 +92,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
 
 
     /**
-     * 新增采购装车实绩
+     * 新增采购装车实绩  / 内转装车实绩
      * @param map  resultMeasuredTonnage ：计量吨位  portId：港口ID
      *             resultLoadStartTime：装车时间 resultIsclear：是否清场
      */
@@ -130,10 +130,10 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         }
         int i = tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
         //修改订单状态为执行中 1
-        int i1 = utilsService.updateOrderStatus(map, 1);
+//        int i1 = utilsService.updateOrderStatus(map, 1);
         //修改运力状态为执行中 1
 //        int i2 = utilsService.updateCapacityStatus(map, 1);
-        return i + i1;
+        return i ;
     }
 
 
@@ -360,6 +360,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
         //设置主键id
         tmstruckLoadResult.setResultId(tmstruckLoadResultMapper.selectMaxId());
+
         //获取开始时间
         Date startTime = (Date) map.get("startTime");
         //获取运输订单号
@@ -521,6 +522,8 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
     public int addDaZhouToDaGangLoadResult(Map<String, Object> map){
         List<Integer> totalResultIdList = (List<Integer>) map.get("totalResultIdList");
         BigDecimal loadingId = DataChange.dataToBigDecimal(map.get("loadingId"));
+        //添加是否需要质检字段
+        BigDecimal isdeduct = DataChange.dataToBigDecimal(map.get("isdeduct"));
         Date loadTime = new Date((long) map.get("loadTime"));
         int count = 0;
         for (Integer totalResultId : totalResultIdList) {
@@ -528,6 +531,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             tmstruckLoadResult.setResultId(tmstruckLoadResultMapper.selectMaxId());
             tmstruckLoadResult.setResultTotalId(new BigDecimal(totalResultId));
             tmstruckLoadResult.setLoadingId(loadingId);
+            tmstruckLoadResult.setIsdeduct(isdeduct);
             tmstruckLoadResult.setResultLoadStartTime(loadTime);
             tmstruckLoadResult.setStatus(new BigDecimal(0));
             tmstruckLoadResult.setInsertTime(new Date());

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

@@ -119,6 +119,11 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
      * 更新卸货实绩内容 扫码人员扫码后获取信息传输数据给接口
      * 1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；
      * 7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：采购内转(达州-厂内)；10：采购内转(老区-厂内)； 11：厂内内转
+     *{
+     *     "orderNumber": "WYSDD2021112800000765",
+     *     "warehouseName": "二棒库",
+     *     "unloadTime":  1638286010000
+     * }
      * @param map
      * @return
      */
@@ -146,7 +151,7 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
                 //计算计皮汽车衡 (当前无法计算汽车衡)
                 map.put("tarePlaceId", 3);
                 i += tmstruckWeightResultService.updateWeightResult(map);
-                i += tmstruckMeasureCommissionService.addPiMeasureCommission(map); //卸货完成后新增一条计皮委托 并发送计皮委托
+//                i += tmstruckMeasureCommissionService.addPiMeasureCommission(map); //卸货完成后新增一条计皮委托 并发送计皮委托
                 i += tmstruckReceiptResultService.addReceiptResult(map); //新增完卸车实绩后新增一条收货实绩
                 break;
             case 10:

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

@@ -182,7 +182,8 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
                     //如果还有未装车的实绩 则代表还有未装车的物资 计算下一装车物资ID 更新下一物资的计皮实绩
                     Map<String, Object> platIdMap = rulesService.calculateMaterial(list); //获得materialId  loadingId
                     platIdMap.put("orderId", map.get("orderId"));
-                    //更新下一计量实绩以当前毛重为皮重
+                    //更新下一计量实绩以当前毛重为皮重  以当前汽车衡为下一计量实绩的计皮汽车衡
+                    platIdMap.put("tarePlaceId", tmstruckWeightResult.getResultTarePlaceId());
                     platIdMap.put("resultTareWeight", map.get("resultGrossWeight"));
                     i += updateWeightResult(platIdMap);
                     //添加仓库排队
@@ -298,6 +299,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             case 6:
             case 7:
             case 8:
+            case 9:
                 //如果订单类型为采购订单 则执行采购订单计皮规则
                 addUpdateRegularField(tmstruckWeightResult); // 添加更新常规字段 就是第二次计重时间
                 //计皮作业完成后自动完成签收
@@ -305,8 +307,6 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
                 //计皮完成后计算出厂门岗并更新实绩出厂门岗ID
                 i += rulesService.calculateGatepost(map);
                 break;
-            case 9:
-                break;
             case 10:
                 break;
             case 11:

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

@@ -740,6 +740,7 @@
                 </foreach>
             </if>
         </where>
+        <include refid="orderByOutTime"></include>
     </select>
 
 <!-- 通过总实绩Id 查询出厂实绩ID   -->
@@ -887,6 +888,7 @@
                 </foreach>
             </if>
         </where>
+        <include refid="orderByOutTime"></include>
     </select>
 
 <!--  查询内转国产矿进口矿  -->

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

@@ -22,19 +22,20 @@
         <result column="LOADING_ID" jdbcType="DECIMAL" property="loadingId" />
         <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId" />
         <result column="LOADING_SEQUENCE" jdbcType="DECIMAL" property="loadingSequence" />
+        <result column="ISDEDUCT" jdbcType="DECIMAL" property="isdeduct" />
     </resultMap>
     <sql id="columns">
-        RESULT_ID, RESULT_TOTAL_ID, RESULT_LOAD_START_TIME, RESULT_LOAD_END_TIME, RESULT_LOAD_DURATION,
-    LOAD_STANDARD_TIME_ID, LOADER_ID, RESULT_ISCLEAR, DELETE_NAME, DELETE_TIME, INSERT_USERNAME,
-    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, STATUS, RESULT_MEASURED_TONNAGE,
-    LOADING_ID, MATERIAL_ID, LOADING_SEQUENCE
+        RESULT_ID, RESULT_TOTAL_ID, RESULT_LOAD_START_TIME, RESULT_LOAD_END_TIME, RESULT_LOAD_DURATION, 
+    LOAD_STANDARD_TIME_ID, LOADER_ID, RESULT_ISCLEAR, DELETE_NAME, DELETE_TIME, INSERT_USERNAME, 
+    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, STATUS, RESULT_MEASURED_TONNAGE, 
+    LOADING_ID, MATERIAL_ID, LOADING_SEQUENCE, ISDEDUCT
     </sql>
     <sql id="columns_alias">
-        t.RESULT_ID, t.RESULT_TOTAL_ID, t.RESULT_LOAD_START_TIME, t.RESULT_LOAD_END_TIME,
-    t.RESULT_LOAD_DURATION, t.LOAD_STANDARD_TIME_ID, t.LOADER_ID, t.RESULT_ISCLEAR, t.DELETE_NAME,
-    t.DELETE_TIME, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME,
-    t.INSERT_UPDATE_REMARK, t.STATUS, t.RESULT_MEASURED_TONNAGE, t.LOADING_ID, t.MATERIAL_ID,
-    t.LOADING_SEQUENCE
+        t.RESULT_ID, t.RESULT_TOTAL_ID, t.RESULT_LOAD_START_TIME, t.RESULT_LOAD_END_TIME, 
+    t.RESULT_LOAD_DURATION, t.LOAD_STANDARD_TIME_ID, t.LOADER_ID, t.RESULT_ISCLEAR, t.DELETE_NAME, 
+    t.DELETE_TIME, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, 
+    t.INSERT_UPDATE_REMARK, t.STATUS, t.RESULT_MEASURED_TONNAGE, t.LOADING_ID, t.MATERIAL_ID, 
+    t.LOADING_SEQUENCE, t.ISDEDUCT
     </sql>
     <sql id="select">
         SELECT <include refid="columns" /> FROM TMSTRUCK_LOAD_RESULT
@@ -104,6 +105,9 @@
             <if test="loadingSequence != null">
                 and LOADING_SEQUENCE = #{loadingSequence}
             </if>
+            <if test="isdeduct != null">
+                and ISDEDUCT = #{isdeduct}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -168,6 +172,9 @@
             <if test="loadingSequence != null">
                 and LOADING_SEQUENCE = #{loadingSequence}
             </if>
+            <if test="isdeduct != null">
+                and ISDEDUCT = #{isdeduct}
+            </if>
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
@@ -234,6 +241,9 @@
         <if test="loadingSequence != null">
             or LOADING_SEQUENCE = #{loadingSequence}
         </if>
+        <if test="isdeduct != null">
+            or ISDEDUCT = #{isdeduct}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.TmstruckLoadResult">
         insert into TMSTRUCK_LOAD_RESULT (RESULT_ID, RESULT_TOTAL_ID, RESULT_LOAD_START_TIME,
@@ -242,16 +252,16 @@
                                           DELETE_NAME, DELETE_TIME, INSERT_USERNAME,
                                           INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
                                           INSERT_UPDATE_REMARK, STATUS, RESULT_MEASURED_TONNAGE,
-                                          LOADING_ID, MATERIAL_ID, LOADING_SEQUENCE
-        )
+                                          LOADING_ID, MATERIAL_ID, LOADING_SEQUENCE,
+                                          ISDEDUCT)
         values (#{resultId,jdbcType=DECIMAL}, #{resultTotalId,jdbcType=DECIMAL}, #{resultLoadStartTime,jdbcType=TIMESTAMP},
                 #{resultLoadEndTime,jdbcType=TIMESTAMP}, #{resultLoadDuration,jdbcType=DECIMAL},
                 #{loadStandardTimeId,jdbcType=DECIMAL}, #{loaderId,jdbcType=DECIMAL}, #{resultIsclear,jdbcType=VARCHAR},
                 #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP}, #{insertUsername,jdbcType=VARCHAR},
                 #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
                 #{insertUpdateRemark,jdbcType=VARCHAR}, #{status,jdbcType=DECIMAL}, #{resultMeasuredTonnage,jdbcType=DECIMAL},
-                #{loadingId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL}, #{loadingSequence,jdbcType=DECIMAL}
-               )
+                #{loadingId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL}, #{loadingSequence,jdbcType=DECIMAL},
+                #{isdeduct,jdbcType=DECIMAL})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmstruckLoadResult">
         insert into TMSTRUCK_LOAD_RESULT
@@ -316,6 +326,9 @@
             <if test="loadingSequence != null">
                 LOADING_SEQUENCE,
             </if>
+            <if test="isdeduct != null">
+                ISDEDUCT,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="resultId != null">
@@ -378,6 +391,9 @@
             <if test="loadingSequence != null">
                 #{loadingSequence,jdbcType=DECIMAL},
             </if>
+            <if test="isdeduct != null">
+                #{isdeduct,jdbcType=DECIMAL},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmstruckLoadResult">
@@ -400,7 +416,8 @@
             RESULT_MEASURED_TONNAGE = #{resultMeasuredTonnage,jdbcType=DECIMAL},
             LOADING_ID = #{loadingId,jdbcType=DECIMAL},
             MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
-            LOADING_SEQUENCE = #{loadingSequence,jdbcType=DECIMAL}
+            LOADING_SEQUENCE = #{loadingSequence,jdbcType=DECIMAL},
+            ISDEDUCT = #{isdeduct,jdbcType=DECIMAL}
         where RESULT_ID = #{resultId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmstruckLoadResult">
@@ -463,6 +480,9 @@
             <if test="loadingSequence != null">
                 LOADING_SEQUENCE = #{loadingSequence,jdbcType=DECIMAL},
             </if>
+            <if test="isdeduct != null">
+                ISDEDUCT = #{isdeduct,jdbcType=DECIMAL},
+            </if>
         </set>
         where RESULT_ID = #{resultId,jdbcType=DECIMAL}
     </update>
@@ -488,8 +508,8 @@
         INSERT_USERNAME, INSERT_TIME,
         UPDATE_USERNAME, UPDATE_TIME,
         INSERT_UPDATE_REMARK, STATUS, RESULT_MEASURED_TONNAGE,
-        LOADING_ID, MATERIAL_ID, LOADING_SEQUENCE
-        )
+        LOADING_ID, MATERIAL_ID, LOADING_SEQUENCE,
+        ISDEDUCT)
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.resultId,jdbcType=DECIMAL},
@@ -500,8 +520,8 @@
         #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
         #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
         #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.status,jdbcType=DECIMAL}, #{item.resultMeasuredTonnage,jdbcType=DECIMAL},
-        #{item.loadingId,jdbcType=DECIMAL}, #{item.materialId,jdbcType=DECIMAL}, #{item.loadingSequence,jdbcType=DECIMAL}
-        from dual
+        #{item.loadingId,jdbcType=DECIMAL}, #{item.materialId,jdbcType=DECIMAL}, #{item.loadingSequence,jdbcType=DECIMAL},
+        #{item.isdeduct,jdbcType=DECIMAL} from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
@@ -587,6 +607,10 @@
         <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.loadingSequence,jdbcType=DECIMAL}
         </foreach>
+        ,ISDEDUCT=
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.isdeduct,jdbcType=DECIMAL}
+        </foreach>
         where RESULT_ID in
         <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
             #{item.resultId,jdbcType=DECIMAL}
@@ -1261,8 +1285,8 @@
 
 <!-- 查询内转进口矿/国产矿装车实绩   -->
     <select id="getImportedDomesticNzLoadResult" parameterType="java.util.Map" resultType="java.util.Map">
-
-        SELECT *
+        SELECT
+               *
         FROM (
                  SELECT APO.PURCHASE_ORDER_NO       "purchaseOrderNo",
                         RM.MATERIAL_NAME            "materialName",

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

@@ -625,7 +625,8 @@
                   TWR.RESULT_NET_WEIGHT       "resultNetWeight",
                   tqr.result_issampling       "issampling",
                   TRR.INSERT_USERNAME         "insertUsername",
-                  TRR.INSERT_TIME             "insertTime"
+                  TRR.INSERT_TIME             "insertTime",
+                  RW.WAREHOUSE_NAME           "warehouseName"
            from TMSTRUCK_RECEIPT_RESULT TRR
                   left join TMSTRUCK_TOTAL_RESULT TTR
                             on TTR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
@@ -649,6 +650,8 @@
                             on OOM.MATERIAL_ID = RM.MATERIAL_ID
                   left join tmstruck_quality_result tqr
                             on tqr.total_result_id = ttr.result_total_id
+                  left join RMS_WAREHOUSE RW
+                            on TUR.RESULT_UNLOAD_PLACE_ID = RW.WAREHOUSE_ID
            where TRR.STATUS = 1
              and OO.ORDER_TYPE = #{orderTypee}
          )

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

@@ -625,7 +625,9 @@
                  left join TMSTRUCK_WEIGHT_RESULT TWR
                            on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         where OO.ORDER_NUMBER = #{orderNumber}
-                and TWR.MATERIAL_ID = #{materialId}
+        <if test="materialId != null">
+            and TWR.MATERIAL_ID = #{materialId}
+        </if>
     </select>
 
     <!--  通过汽车衡编号查询对应的汽车衡ID  -->