Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

pom.xml

@@ -156,7 +156,8 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>MEASURE_JSON_DATA</param>
+<!--                        <param>MEASURE_JSON_DATA</param>-->
+                        <param>DIL_CID_CAPACITY</param>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -385,7 +385,7 @@ public class StatisticalReportController extends BaseRESTfulController {
         return success(pageList);
     }
 
-    @ApiOperation(value="查询该组织机构下的内转统计报表")
+    @ApiOperation(value="查询该组织机构下的采购内转统计报表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId", value = "s", required = false, dataType = "Integer"),

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

@@ -131,4 +131,6 @@ public interface TmstruckLoadResultMapper extends IBaseMapper<TmstruckLoadResult
 
     Map<String, Object> getLoadResultMap(BigDecimal resultTotalId);
 
+
+
 }

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

@@ -200,6 +200,8 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
     @Transactional(rollbackFor = Exception.class)
     public int addXS2LoadResult(Map<String, Object> map) throws Exception {
         TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
+        BigDecimal orderId=null;
+        int i=0;
         //通过运输订单号查询订单类型
         String orderNumber = (String) map.get("orderNumber");
         //通过订单号查询订单类型 及总实绩Id
@@ -207,24 +209,31 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         String capacityNumber = (String) mesMap.get("capacityNumber");
         int orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
         BigDecimal resultTotalId = DataChange.dataToBigDecimal(mesMap.get("totalId"));
+        orderId = DataChange.dataToBigDecimal(mesMap.get("orderId"));
         //装货时查询是否含有净重
         Integer netWeight = tmstruckUnloadResultMapper.getNetWeightByTotalId(resultTotalId);
         if(orderType == 11 || orderType == 15 || orderType == 16){
-            int sqe = DataChange.dataToBigDecimal(mesMap.get("Sqe")).intValue();
-            sqe = sqe + 1;
-            map.put("resultId",tmstruckLoadResultMapper.selectMaxId());
-            map.put("Sqe",sqe);//查询路段顺序号+1
-            map.put("resultTotalId", resultTotalId);
-            int i =tmstruckLoadResultMapper.insertSelective(generateLoad(map));
-            //更新路段顺序号
-            mesMap.put("orderLineSequence",sqe);
-            utilsService.updateOrderLineSqeByOrderNumber(mesMap);
-            //推送消息到websocket
-            utilsService.pushMesToWebsocket(capacityNumber, "装货");
-            BigDecimal orderId = DataChange.dataToBigDecimal(mesMap.get("orderId"));
-            int i1 = addCapacityRemark(map);
-            if(i1 == -5){
-                return -5;
+            //判断是否有装货实绩
+            BigDecimal resultId = tmstruckLoadResultMapper.getResultId(resultTotalId);
+            if (resultId==null) {
+                int sqe = DataChange.dataToBigDecimal(mesMap.get("Sqe")).intValue();
+                sqe = sqe + 1;
+                map.put("resultId", tmstruckLoadResultMapper.selectMaxId());
+                map.put("Sqe", sqe);//查询路段顺序号+1
+                map.put("resultTotalId", resultTotalId);
+                 i += tmstruckLoadResultMapper.insertSelective(generateLoad(map));
+                //更新路段顺序号
+                mesMap.put("orderLineSequence", sqe);
+                utilsService.updateOrderLineSqeByOrderNumber(mesMap);
+                //推送消息到websocket
+                utilsService.pushMesToWebsocket(capacityNumber, "装货");
+            }else {
+                //已装货的实绩
+                map.put("resultId",resultId);
+            }
+             i += addCapacityRemark(map);
+            if (i==-5){
+                return  -5;
             }
             //根据运输订单查找需求备注
             Map<String,Object>  remarkMap=tmstruckTimeTaskResultMapper.selectInwardDueTimeByOrderId(orderId);
@@ -278,7 +287,6 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             if(personnelId != null){
                 tmstruckLoadResult.setLoaderId(new BigDecimal(personnelId));
             }
-
         }
         // 更新装货点
         tmstruckLoadResult.setLoadingId(DataChange.dataToBigDecimal(map.get("warehouseId")));
@@ -303,7 +311,6 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         //推送消息到websocket
         utilsService.pushMesToWebsocket(capacityNumber, "装货");
         //map.put("orderTypee",orderType);
-
         if (map.get("warehouseId")==null){
           map.put("warehouseName",null);
         }else {
@@ -311,7 +318,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             String warehouseName = utilsMapper.queryWarehouseName(DataChange.dataToBigDecimal(map.get("warehouseId")));
             map.put("warehouseName",warehouseName);
         }
-        int i = tmstruckMeasureCommissionService.addMeasureCommissionForLoding(map);
+//        int i = tmstruckMeasureCommissionService.addMeasureCommissionForLoding(map);
         return 1;
     }
 
@@ -457,10 +464,10 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
     public int addCapacityRemark(Map<String, Object> map) {
         int i=0;
         TmstruckLoadResult tmstruckLoadResult=new TmstruckLoadResult();
-        String capacityName = utilsMapper.getCapacityNameBySsoId((String) map.get("personnelSsoId") );
+        String capacityName = utilsMapper.getCapacityNameBySsoId((String) map.get("personnelSsoId"));
         if (capacityName!=null) {
-            //通过车牌去寻找装货实绩,减少多次装货
-            map.put("capacityName", capacityName);
+            map.put("capacityName",capacityName);
+            //判断装机是否重复扫码
             BigDecimal loadResultId = utilsMapper.getLoadResultId(map);
             if (loadResultId == null) {
                 tmstruckLoadResult.setResultId(DataChange.dataToBigDecimal(map.get("resultId")));

src/main/java/com/steerinfo/dil/util/MD5Util.java

@@ -1,7 +1,12 @@
 package com.steerinfo.dil.util;
 
 
+import org.bouncycastle.crypto.digests.SHA256Digest;
+import org.bouncycastle.jcajce.provider.digest.SHA256;
+
+import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.SimpleTimeZone;
@@ -62,9 +67,47 @@ import java.util.SimpleTimeZone;
             String ApiId = "EUCP-EMY-SMS1-10QNI";
             String sererct = "EE20B0B28B75E567";
             System.out.println(formatTimeTmp());
-            System.out.println(sign(ApiId,sererct));
+            String appkey = "p3w1aUqaAx7jDaXsg5bss4";
+            String mastersecret = "ENLIzfdMSc55VghR97lqJ4";
+            String sign = appkey + formatTimeTmp() + mastersecret;
+            //SHA256 sha256 = new SHA256();
+            //System.out.println(sha256(1))
+            System.out.println(getSHA256StrJava(sign));
         }
 
-
+    public static String getSHA256StrJava(String str){
+        MessageDigest messageDigest;
+        String encodeStr = "";
+        try {
+            messageDigest = MessageDigest.getInstance("SHA-256");
+            messageDigest.update(str.getBytes("UTF-8"));
+            encodeStr = byte2Hex(messageDigest.digest());
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        return encodeStr;
+    }
+    /**
+     * 将byte转为16进制
+     * @param bytes
+     * @return
+     */
+    private static String byte2Hex(byte[] bytes){
+        StringBuffer stringBuffer = new StringBuffer();
+        String temp = null;
+        for (int i=0;i<bytes.length;i++){
+            temp = Integer.toHexString(bytes[i] & 0xFF);
+            if (temp.length()==1){
+                //1得到一位的进行补0操作
+                stringBuffer.append("0");
+            }
+            stringBuffer.append(temp);
+        }
+        return stringBuffer.toString();
     }
 
+
+}
+

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

@@ -1392,6 +1392,7 @@
         ON TLFR1.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         where
         twr.result_net_weight IS NOT NULL
+        AND  OO.ORDER_STATUS = 2
         AND  oo.ORDER_TYPE in (15,16)
         <if test="orgCode!=null">
             and oo.OPTIONER_CODE =  #{orgCode}
@@ -1513,6 +1514,7 @@
                TWR.RESULT_NET_WEIGHT "resultNetWeight",
                TWR.RESULT_GROSS_WEIGHT_TIME "grossweightTime",
                TWR.RESULT_TARE_WEIGHT_TIME "tareWeightTime",
+               GREATEST(TWR.RESULT_GROSS_WEIGHT_TIME,TWR.RESULT_TARE_WEIGHT_TIME) "netTime",
                TWR.RESULT_TARE_WEIGHT "tareWeight",
                TWR.RESULT_GROSS_WEIGHT "grossWeight",
                RC2.CAPACITY_NUMBER "capacityNumber",
@@ -1579,6 +1581,7 @@
                      twr4.result_tare_weight       "tareWeight",
                      twr4.result_tare_weight_time  "tareWeightTime",
                      twr4.result_net_weight        "resultNetWeight",
+                     GREATEST(TWR4.RESULT_GROSS_WEIGHT_TIME,TWR4.RESULT_TARE_WEIGHT_TIME) "netTime",
                      RC.CARRIER_NAME "carrierName",
                      RL.LINE_NAME "lineName"
                        from omstruck_order oo
@@ -1643,7 +1646,7 @@
                    AND TWR4.TARE_SEGMENT_SQE = 9
                   AND TLFR2.SEGMENT_SQE = 10
                   AND   twr4.result_net_weight IS NOT NULL
-                    AND  oo.ORDER_TYPE in (10,20)
+                  AND  oo.ORDER_TYPE in (10,20)
         <if test="orgCode!=null">
                 and oo.OPTIONER_CODE =  #{orgCode}
         </if>
@@ -1662,7 +1665,9 @@
              )
     </select>
     <select id="getPurchaseOrderList" resultType="java.util.Map" parameterType="java.util.Map">
-        select OO.ORDER_NUMBER "orderNumber",
+        select
+               DISTINCT
+               OO.ORDER_NUMBER "orderNumber",
                RM.MATERIAL_NAME "materialName",
                RC.CAPACITY_NUMBER "capacityNumber",
                RS.SUPPLIER_NAME "sendName",
@@ -1674,6 +1679,7 @@
                TWR.RESULT_NET_WEIGHT "resultNetWeight",
                RL.LINE_NAME "lineName",
                RC3.CARRIER_NAME "carrierName",
+               GREATEST(TWR.RESULT_GROSS_WEIGHT_TIME,TWR.RESULT_TARE_WEIGHT_TIME) "netTime",
                DB.RESULT_FOREIGN_SHIP_NAME  "shipName"
         from OMSTRUCK_ORDER OO
         LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
@@ -1724,6 +1730,7 @@
     <select id="getInwardInFactory" resultType="java.util.Map" parameterType="java.util.Map">
         select * from (
         select
+        distinct
         OO.ORDER_NUMBER "orderNumber",
         RC.CAPACITY_NUMBER "capacityNumber",
         RW1.WAREHOUSE_NAME "reciveName",
@@ -1732,7 +1739,7 @@
         TWR.RESULT_NET_WEIGHT "resultNetWeight",
         TWR.RESULT_TARE_WEIGHT_TIME "tareWeightTime",
         TWR.RESULT_TARE_WEIGHT "tareWeight",
-        greatest(TWR.RESULT_TARE_WEIGHT_TIME,TWR.RESULT_GROSS_WEIGHT_TIME) "netWeightTime",
+        greatest(TWR.RESULT_TARE_WEIGHT_TIME,TWR.RESULT_GROSS_WEIGHT_TIME) "netTime",
         TWR.RESULT_GROSS_WEIGHT_TIME "grossweightTime",
         TWR.RESULT_GROSS_WEIGHT "grossWeight",
         RL.LINE_NAME "lineName",
@@ -1756,7 +1763,9 @@
         left join RMS_WAREHOUSE RW2 on ARM.REQUIREMENT_PLATFORM_ID = RW2.WAREHOUSE_ID
         left join RMS_MATERIAL_TYPE RMT ON RMT.MATERIAL_TYPE_ID = RM.MATERIAL_TYPE_ID
         <where>
-            OO.ORDER_TYPE = 11  AND  TWR.RESULT_NET_WEIGHT IS NOT NULL
+            TWR.RESULT_NET_WEIGHT IS NOT NULL
+            AND  OO.ORDER_STATUS = 2
+            AND OO.ORDER_TYPE = 11
             <if test="orgCode!=null">
                 AND OO.OPTIONER_CODE=#{orgCode}
             </if>
@@ -1789,6 +1798,7 @@
         twr.result_tare_weight       "tareWeight",
         twr.result_tare_weight_time  "tareWeightTime",
         twr.result_net_weight        "resultNetWeight",
+        GREATEST(TWR.RESULT_GROSS_WEIGHT_TIME,TWR.RESULT_TARE_WEIGHT_TIME) "netTime",
         RC.CARRIER_NAME "carrierName",
         RL.LINE_NAME "lineName",
         DB.RESULT_FOREIGN_SHIP_NAME "shipName",
@@ -1838,6 +1848,7 @@
         ON TLFR1.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         where
         twr.result_net_weight IS NOT NULL
+        AND  OO.ORDER_STATUS = 2
         AND  oo.ORDER_TYPE in (23,24)
         <if test="orgCode!=null">
             and oo.OPTIONER_CODE =  #{orgCode}