修改计量回传接口

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

@@ -183,6 +183,24 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
     }
 
 
+
+
+
+    @ApiOperation(value="回传装货点数据 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "", required = false, dataType = "Map"),
+    })
+    @PostMapping("/loadMeasureTest")
+    public RESTfulResult loadMeasureTest(@RequestBody(required=false) Map<String, Object> map){
+        try {
+            int i = tmstruckLoadResultService.LoadMeasure(map);
+            } catch (Exception exception) {
+            exception.printStackTrace();
+        }
+
+        return failed("装货异常，请联系管理员！");
+    }
+
     @ApiOperation(value="修改汽车装车实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "tmstruckLoadResult", value = "装车作业实绩对象", required = false, dataType = "TmstruckLoadResult"),

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

@@ -52,6 +52,14 @@ public interface TmstruckLeaveFactoryResultMapper extends IBaseMapper<TmstruckLe
 
     List<Map<String,Object>> getDeliveryOrderMaterial(String orderNumber);
 
+    //根据运输订单号查找过磅重量
+    Map<String,Object> getNetWeightByOrder(Map<String,Object> map);
+
+    //根据运输订单查找物资理重
+    String getTheoryWeight(Map<String,Object> map);
+
+
+
     // 查询零星物资出厂列表
     List<Map<String,Object>> getSporadicLeaveFactory(Map<String, Object> mapValue);
 

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

@@ -15,6 +15,10 @@ public interface TmstruckMeasureCommissionMapper extends IBaseMapper<TmstruckMea
     //查询计量委托
     List<Map<String, Object>> getMeasureCommission(Map<String, Object> map);
 
+
+    //获取装货点数据
+    List<Map<String,Object>> getLoadMeasure();
+
     //查询最大主键Id
     @Select("select seq_measure_commission.nextval from dual")
     BigDecimal selectMaxId();

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

@@ -26,6 +26,24 @@ public class MeasureJsonData implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="存储报文",required=false)
     private String measureJsonData;
 
+    /**
+     * 物流请求url(MEASURE_JSON_URL,VARCHAR,255)
+     */
+    @ApiModelProperty(value="物流请求url",required=false)
+    private String measureJsonUrl;
+
+    /**
+     * 运输订单号(ORDER_NUMBER,VARCHAR,255)
+     */
+    @ApiModelProperty(value="运输订单号",required=false)
+    private String orderNumber;
+
+    /**
+     * 装货地点(WAREHOUSE_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="装货地点",required=false)
+    private String warehouseName;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -62,6 +80,30 @@ public class MeasureJsonData implements IBasePO<BigDecimal> {
         this.measureJsonData = measureJsonData == null ? null : measureJsonData.trim();
     }
 
+    public String getMeasureJsonUrl() {
+        return measureJsonUrl;
+    }
+
+    public void setMeasureJsonUrl(String measureJsonUrl) {
+        this.measureJsonUrl = measureJsonUrl == null ? null : measureJsonUrl.trim();
+    }
+
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber == null ? null : orderNumber.trim();
+    }
+
+    public String getWarehouseName() {
+        return warehouseName;
+    }
+
+    public void setWarehouseName(String warehouseName) {
+        this.warehouseName = warehouseName == null ? null : warehouseName.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -71,6 +113,9 @@ public class MeasureJsonData implements IBasePO<BigDecimal> {
         sb.append(", measureId=").append(measureId);
         sb.append(", measureTypeId=").append(measureTypeId);
         sb.append(", measureJsonData=").append(measureJsonData);
+        sb.append(", measureJsonUrl=").append(measureJsonUrl);
+        sb.append(", orderNumber=").append(orderNumber);
+        sb.append(", warehouseName=").append(warehouseName);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/dil/service/ITmstruckLoadResultService.java

@@ -35,6 +35,10 @@ public interface ITmstruckLoadResultService{
     //修改销售钢渣、水渣、危化品装车实绩
     int addXS2LoadResult(Map<String, Object> map) throws Exception;
 
+
+    //测试
+    int LoadMeasure(Map<String, Object> map) throws Exception;
+
     //修改装车作业
     int updateLoadResult(TmstruckLoadResult tmstruckLoadResult);
 

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

@@ -305,21 +305,24 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         //推送消息到websocket
         utilsService.pushMesToWebsocket(capacityNumber, "装货");
         //map.put("orderTypee",orderType);
-        //发送计量委托
-        //if (map.get("warehouseId")==null){
-        //  map.put("warehouseName",null);
-        //}else {
-        //    //根据id查找装货点名称
-        //    String warehouseName = utilsMapper.queryWarehouseName(DataChange.dataToBigDecimal(map.get("warehouseId")));
-        //    map.put("warehouseName",warehouseName);
-        //}
-        //int i = tmstruckMeasureCommissionService.addMeasureCommissionForLoding(map);
-        //if (i!=1){
-        // return  -7;
-        //}
+
+        if (map.get("warehouseId")==null){
+          map.put("warehouseName",null);
+        }else {
+            //根据id查找装货点名称
+            String warehouseName = utilsMapper.queryWarehouseName(DataChange.dataToBigDecimal(map.get("warehouseId")));
+            map.put("warehouseName",warehouseName);
+        }
+        int i = tmstruckMeasureCommissionService.addMeasureCommissionForLoding(map);
         return 1;
     }
 
+    @Override
+    public int LoadMeasure(Map<String, Object> map) throws Exception {
+        return tmstruckMeasureCommissionService.addMeasureCommissionForLoding(map);
+    }
+
+
     //内转添加装货实绩
     private TmstruckLoadResult generateLoad(Map<String, Object> map) {
         TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();

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

@@ -97,20 +97,30 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
     //添加装货点发送委托给计量
     @Override
     public int addMeasureCommissionForLoding(Map<String, Object> map) throws Exception {
-        String loadingPace = (String) map.get("warehouseName");
-        String url = "http://172.16.33.122:44325/api/logistics/modifyLoadPlace";
-        String ysdd = (String) map.get("orderNumber");
-        String sendUrl = url + "?ysdd=" + ysdd + "&loadingPace=" + loadingPace;
-        String jsonData = getRequestUtils.doGet(sendUrl);
-        System.out.println("委托已发送" + jsonData);
-        MeasureJsonData measureJsonData = new MeasureJsonData();
-        BigDecimal measureId = measureJsonDataMapper.selectMaxId();
-        //设置主键id
-        measureJsonData.setMeasureId(measureId);
-        //老厂区报文
-        measureJsonData.setMeasureTypeId(new BigDecimal(1));
-        measureJsonData.setMeasureJsonData(jsonData);
-        int i = measureJsonDataMapper.insertSelective(measureJsonData);
+        int i = 0;
+//        if (map.get("status")!=null) {
+//            List<Map<String, Object>> mapList = tmstruckMeasureCommissionMapper.getLoadMeasure();
+//            for (Map<String, Object> map1 : mapList) {
+                String loadingPace = (String) map.get("warehouseName");
+                String url = "http://172.16.33.122:44325/api/logistics/modifyLoadPlace";
+                String ysdd = (String) map.get("orderNumber");
+                String sendUrl = url + "?ysdd=" + ysdd + "&loadingPace=" + loadingPace;
+                String jsonData = getRequestUtils.doGet(sendUrl);
+                System.out.println(sendUrl);
+                System.out.println("委托已发送" + jsonData);
+                MeasureJsonData measureJsonData = new MeasureJsonData();
+                BigDecimal measureId = measureJsonDataMapper.selectMaxId();
+                //设置主键id
+                measureJsonData.setMeasureId(measureId);
+                //老厂区报文
+                measureJsonData.setMeasureTypeId(new BigDecimal(1));
+                measureJsonData.setMeasureJsonData(jsonData);
+                measureJsonData.setMeasureJsonUrl(sendUrl);
+                measureJsonData.setWarehouseName(loadingPace);
+                measureJsonData.setOrderNumber(ysdd);
+                i = measureJsonDataMapper.insertSelective(measureJsonData);
+//            }
+//        }
         return i;
     }
 

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

@@ -43,8 +43,28 @@ public class TmstruckSelfMachineService implements ITmstruckSelfMachineService {
     public Map<String, Object> getDeliveryOrder(String orderNumber) {
         //1.根据运输订单号查询主干信息
         Map<String,Object> map = tmstruckLeaveFactoryResultMapper.getDeliveryOrder(orderNumber);
+        map.put("orderNumber",orderNumber);
         if(map !=null){
             List<Map<String, Object>> deliveryOrderMaterialList = tmstruckLeaveFactoryResultMapper.getDeliveryOrderMaterial(orderNumber);
+            //判断为棒材还是线材
+            for (Map<String,Object> map1:deliveryOrderMaterialList){
+                map1.remove("materialWeight");
+                String materialName =(String) map1.get("materialName");
+                map.put("materialName",materialName);
+                //判断是否为盘螺
+                if (materialName.contains("盘螺")){
+                    //根据运输订单号查找实绩重量
+                    Map<String, Object> netWeight = tmstruckLeaveFactoryResultMapper.getNetWeightByOrder(map);
+                    String nowNetWeight =(String) netWeight.get("nowNetWeight");
+                    if (nowNetWeight!=null) {
+                        map.put("materialWeight", nowNetWeight);
+                    }
+                }else {
+                    //获取物资理重
+                    String theoryWeight = tmstruckLeaveFactoryResultMapper.getTheoryWeight(map);
+                    map.put("materialWeight",theoryWeight);
+                }
+            }
             map.put("deliveryOrderMaterialList",deliveryOrderMaterialList);
         }
         return map;

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

@@ -5,12 +5,16 @@
     <id column="MEASURE_ID" jdbcType="DECIMAL" property="measureId" />
     <result column="MEASURE_TYPE_ID" jdbcType="DECIMAL" property="measureTypeId" />
     <result column="MEASURE_JSON_DATA" jdbcType="VARCHAR" property="measureJsonData" />
+    <result column="MEASURE_JSON_URL" jdbcType="VARCHAR" property="measureJsonUrl" />
+    <result column="ORDER_NUMBER" jdbcType="VARCHAR" property="orderNumber" />
+    <result column="WAREHOUSE_NAME" jdbcType="VARCHAR" property="warehouseName" />
   </resultMap>
   <sql id="columns">
-    MEASURE_ID, MEASURE_TYPE_ID, MEASURE_JSON_DATA
+    MEASURE_ID, MEASURE_TYPE_ID, MEASURE_JSON_DATA, MEASURE_JSON_URL, ORDER_NUMBER, WAREHOUSE_NAME
   </sql>
   <sql id="columns_alias">
-    t.MEASURE_ID, t.MEASURE_TYPE_ID, t.MEASURE_JSON_DATA
+    t.MEASURE_ID, t.MEASURE_TYPE_ID, t.MEASURE_JSON_DATA, t.MEASURE_JSON_URL, t.ORDER_NUMBER,
+    t.WAREHOUSE_NAME
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM MEASURE_JSON_DATA
@@ -29,6 +33,15 @@
       <if test="measureJsonData != null and measureJsonData != ''">
         and MEASURE_JSON_DATA = #{measureJsonData}
       </if>
+      <if test="measureJsonUrl != null and measureJsonUrl != ''">
+        and MEASURE_JSON_URL = #{measureJsonUrl}
+      </if>
+      <if test="orderNumber != null and orderNumber != ''">
+        and ORDER_NUMBER = #{orderNumber}
+      </if>
+      <if test="warehouseName != null and warehouseName != ''">
+        and WAREHOUSE_NAME = #{warehouseName}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -42,6 +55,15 @@
       <if test="measureJsonData != null and measureJsonData != ''">
         and MEASURE_JSON_DATA LIKE '%${measureJsonData}%'
       </if>
+      <if test="measureJsonUrl != null and measureJsonUrl != ''">
+        and MEASURE_JSON_URL LIKE '%${measureJsonUrl}%'
+      </if>
+      <if test="orderNumber != null and orderNumber != ''">
+        and ORDER_NUMBER LIKE '%${orderNumber}%'
+      </if>
+      <if test="warehouseName != null and warehouseName != ''">
+        and WAREHOUSE_NAME LIKE '%${warehouseName}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
@@ -57,11 +79,22 @@
     <if test="measureJsonData != null and measureJsonData != ''">
       or MEASURE_JSON_DATA = #{measureJsonData}
     </if>
+    <if test="measureJsonUrl != null and measureJsonUrl != ''">
+      or MEASURE_JSON_URL = #{measureJsonUrl}
+    </if>
+    <if test="orderNumber != null and orderNumber != ''">
+      or ORDER_NUMBER = #{orderNumber}
+    </if>
+    <if test="warehouseName != null and warehouseName != ''">
+      or WAREHOUSE_NAME = #{warehouseName}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.MeasureJsonData">
-    insert into MEASURE_JSON_DATA (MEASURE_ID, MEASURE_TYPE_ID, MEASURE_JSON_DATA
+    insert into MEASURE_JSON_DATA (MEASURE_ID, MEASURE_TYPE_ID, MEASURE_JSON_DATA,
+                                   MEASURE_JSON_URL, ORDER_NUMBER, WAREHOUSE_NAME
     )
-    values (#{measureId,jdbcType=DECIMAL}, #{measureTypeId,jdbcType=DECIMAL}, #{measureJsonData,jdbcType=VARCHAR}
+    values (#{measureId,jdbcType=DECIMAL}, #{measureTypeId,jdbcType=DECIMAL}, #{measureJsonData,jdbcType=VARCHAR},
+            #{measureJsonUrl,jdbcType=VARCHAR}, #{orderNumber,jdbcType=VARCHAR}, #{warehouseName,jdbcType=VARCHAR}
            )
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.MeasureJsonData">
@@ -76,6 +109,15 @@
       <if test="measureJsonData != null">
         MEASURE_JSON_DATA,
       </if>
+      <if test="measureJsonUrl != null">
+        MEASURE_JSON_URL,
+      </if>
+      <if test="orderNumber != null">
+        ORDER_NUMBER,
+      </if>
+      <if test="warehouseName != null">
+        WAREHOUSE_NAME,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="measureId != null">
@@ -87,12 +129,24 @@
       <if test="measureJsonData != null">
         #{measureJsonData,jdbcType=VARCHAR},
       </if>
+      <if test="measureJsonUrl != null">
+        #{measureJsonUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="orderNumber != null">
+        #{orderNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="warehouseName != null">
+        #{warehouseName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.MeasureJsonData">
     update MEASURE_JSON_DATA
     set MEASURE_TYPE_ID = #{measureTypeId,jdbcType=DECIMAL},
-        MEASURE_JSON_DATA = #{measureJsonData,jdbcType=VARCHAR}
+        MEASURE_JSON_DATA = #{measureJsonData,jdbcType=VARCHAR},
+        MEASURE_JSON_URL = #{measureJsonUrl,jdbcType=VARCHAR},
+        ORDER_NUMBER = #{orderNumber,jdbcType=VARCHAR},
+        WAREHOUSE_NAME = #{warehouseName,jdbcType=VARCHAR}
     where MEASURE_ID = #{measureId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.MeasureJsonData">
@@ -104,6 +158,15 @@
       <if test="measureJsonData != null">
         MEASURE_JSON_DATA = #{measureJsonData,jdbcType=VARCHAR},
       </if>
+      <if test="measureJsonUrl != null">
+        MEASURE_JSON_URL = #{measureJsonUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="orderNumber != null">
+        ORDER_NUMBER = #{orderNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="warehouseName != null">
+        WAREHOUSE_NAME = #{warehouseName,jdbcType=VARCHAR},
+      </if>
     </set>
     where MEASURE_ID = #{measureId,jdbcType=DECIMAL}
   </update>
@@ -122,13 +185,15 @@
   <insert id="batchInsert" parameterType="java.util.List">
     insert into MEASURE_JSON_DATA
     (MEASURE_ID,
-    MEASURE_TYPE_ID, MEASURE_JSON_DATA
-    )
+    MEASURE_TYPE_ID, MEASURE_JSON_DATA,
+    MEASURE_JSON_URL, ORDER_NUMBER,
+    WAREHOUSE_NAME)
     ( <foreach collection="list" item="item" separator="union all">
     select
     #{item.measureId,jdbcType=DECIMAL},
-    #{item.measureTypeId,jdbcType=DECIMAL}, #{item.measureJsonData,jdbcType=VARCHAR}
-    from dual
+    #{item.measureTypeId,jdbcType=DECIMAL}, #{item.measureJsonData,jdbcType=VARCHAR},
+    #{item.measureJsonUrl,jdbcType=VARCHAR}, #{item.orderNumber,jdbcType=VARCHAR},
+    #{item.warehouseName,jdbcType=VARCHAR} from dual
   </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -146,6 +211,18 @@
     <foreach collection="list" item="item" index="index" separator=" " open="case MEASURE_ID" close="end">
       when #{item.measureId,jdbcType=DECIMAL} then #{item.measureJsonData,jdbcType=VARCHAR}
     </foreach>
+    ,MEASURE_JSON_URL=
+    <foreach collection="list" item="item" index="index" separator=" " open="case MEASURE_ID" close="end">
+      when #{item.measureId,jdbcType=DECIMAL} then #{item.measureJsonUrl,jdbcType=VARCHAR}
+    </foreach>
+    ,ORDER_NUMBER=
+    <foreach collection="list" item="item" index="index" separator=" " open="case MEASURE_ID" close="end">
+      when #{item.measureId,jdbcType=DECIMAL} then #{item.orderNumber,jdbcType=VARCHAR}
+    </foreach>
+    ,WAREHOUSE_NAME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case MEASURE_ID" close="end">
+      when #{item.measureId,jdbcType=DECIMAL} then #{item.warehouseName,jdbcType=VARCHAR}
+    </foreach>
     where MEASURE_ID in
     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
       #{item.measureId,jdbcType=DECIMAL}

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

@@ -1301,4 +1301,35 @@
         SELECT OO.ORDER_STATUS  FROM OMSTRUCK_ORDER OO
         WHERE OO.ORDER_ID   = #{orderId}
     </select>
+
+   <!-- 获取物资实重-->
+    <select id="getNetWeightByOrder" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT TWR.RESULT_NET_WEIGHT AS "nowNetWeight"
+        FROM OMSTRUCK_ORDER OO
+        left join OMSTRUCK_ORDER_MATERIAL OOM
+        ON OOM.ORDER_ID=OO.ORDER_ID
+        LEFT JOIN RMS_MATERIAL RM
+         ON RM.MATERIAL_ID=OOM.MATERIAL_ID
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON OO.ORDER_ID = TTR.ORDER_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+        ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        WHERE OO.ORDER_NUMBER = #{orderNumber} and RM.MATERIAL_NAME=#{materialName}
+    </select>
+<!--    获取物资理重-->
+    <select id="getTheoryWeight" resultType="java.lang.String" parameterType="java.util.Map">
+        select ASTM.MATERIAL_THEORETICAL_WEIGHT "theoreticalWeight"
+       from OMSTRUCK_ORDER oo
+       left join AMS_SALE_ORDER_MATERIAL ASOM
+       ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+       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
+       LEFT JOIN AMS_SALE_ORDER ASO
+       ON ASO.SALE_ORDER_ID=ASM.SALE_ORDER_ID
+        left join RMS_MATERIAL RM
+        ON RM.MATERIAL_ID=ASM.MATERIAL_ID
+       where  oo.ORDER_NUMBER=#{orderNumber}  and RM.MATERIAL_NAME=#{materialName}
+    </select>
 </mapper>

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

@@ -1369,5 +1369,18 @@
         WHERE TWR.RESULT_NET_WEIGHT IS not NULL
         AND OO.ORDER_ID = #{orderId}
     </select>
+    <select id="getLoadMeasure" resultType="java.util.Map">
+        select OO.ORDER_NUMBER "orderNumber",
+               RW.WAREHOUSE_NAME "warehouseName"
+        from OMSTRUCK_ORDER OO
+                 LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                           ON TTR.ORDER_ID=OO.ORDER_ID
+                 LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
+                           ON TTR.RESULT_TOTAL_ID = TLR.RESULT_TOTAL_ID
+                 LEFT JOIN RMS_WAREHOUSE RW
+                           ON RW.WAREHOUSE_ID = TLR.LOADING_ID
+        WHERE RW.WAREHOUSE_NAME IS NOT NULL AND RW.WAREHOUSE_NAME NOT IN ('化工厂','二炼焦酸碱库房','铁专线—五线','二炼焦','二焦化_油库','化工园区铁专线')
+        order by OO.ORDER_NUMBER DESC
+    </select>
 
 </mapper>