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/service/impl/TmstruckEnfactoryResultServiceImpl.java

@@ -167,8 +167,8 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         else if (orderType == 21){//调用计时作业方法
             return orderType21Use(map, orderNumber, DataChange.dataToBigDecimal(mesMap.get("orderId")));
         }
-        //如果订单类型为2 则需要财务公司审核才能进厂
-        if(orderType == 2 || orderType == 1){
+        //如果订单类型为2 则需要财务公司审核才能进厂//如果订单为销售，1,2,内转钢材异地库-4
+        if(orderType == 2 || orderType == 1 ||  orderType == 4){
             Integer saleOrderStatus = tmstruckEnfactoryResultMapper.getSaleOrderStatus(DataChange.dataToBigDecimal(mesMap.get("orderId")));
             if(saleOrderStatus != 4){
                throw new Exception("审批未通过不能进厂！");
@@ -192,6 +192,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         int checkMeasureCommission = 0;
         switch (orderType){
             case 1:
+            case 4:
                 checkMeasureCommission = steelOrderEnFactory(map, selectMap, resultTotalId);
                 break;
             case 2:

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

@@ -243,10 +243,11 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                     Map<String, Object> parem=tmstruckLeaveFactoryResultService.getTruckFactoryResult(orderNumber);
                     parem.put("turnOf","0");
                     otmsFeign.createTotalResult(parem);
+                    // 调用结算
+                    bmsTruckFeign.addDetailsOrder(orderId);
                 }catch (Exception ex){
 
                 }
-//                bmsTruckFeign.addDetailsOrder(orderId);
                 break;
             case 2:
             case 3:
@@ -265,6 +266,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 bmsTruckFeign.addDetailsOrder(orderId);
                 break;
             case 4:
+                i += utilsService.closeOrderNormally(map);
                 break;
             case 5:
             case 6:

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

@@ -213,7 +213,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         //装货时查询是否含有净重
         Integer netWeight = tmstruckUnloadResultMapper.getNetWeightByTotalId(resultTotalId);
         if(orderType == 11 || orderType == 15 || orderType == 16){
-            //判断是否有装货实绩
+            //判断是否有装货实绩,如果有装货实绩,则更新
             BigDecimal resultId = tmstruckLoadResultMapper.getResultId(resultTotalId);
             if (resultId==null) {
                 int sqe = DataChange.dataToBigDecimal(mesMap.get("Sqe")).intValue();
@@ -229,11 +229,22 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
                 utilsService.pushMesToWebsocket(capacityNumber, "装货");
             }else {
                 //已装货的实绩
-                map.put("resultId",resultId);
-            }
-             i += addCapacityRemark(map);
-            if (i==-5){
-                return  -5;
+                //map.put("resultId",resultId);
+                tmstruckLoadResult.setResultId(resultId);
+                if(map.get("personnelSsoId") != null){
+                    //通过SSo主键查询人员管理主键
+                    Integer personnelId = utilsMapper.getPersonnelIdBySsoId((String) map.get("personnelSsoId"));
+                    if(personnelId != null){
+                        tmstruckLoadResult.setLoaderId(new BigDecimal(personnelId));
+                    }else{
+                        String capacityName = utilsMapper.getCapacityNameBySsoId((String) map.get("personnelSsoId"));
+                        if(capacityName != null){
+                            tmstruckLoadResult.setCapacityRemark(capacityName);
+                        }
+                    }
+                }
+                i += tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
+
             }
             //根据运输订单查找需求备注
             Map<String,Object>  remarkMap=tmstruckTimeTaskResultMapper.selectInwardDueTimeByOrderId(orderId);
@@ -350,6 +361,11 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             Integer personnelId = utilsMapper.getPersonnelIdBySsoId((String) map.get("personnelSsoId"));
             if(personnelId != null){
                 tmstruckLoadResult.setLoaderId(new BigDecimal(personnelId));
+            }else{
+                String capacityName = utilsMapper.getCapacityNameBySsoId((String) map.get("personnelSsoId"));
+                if(capacityName != null){
+                    tmstruckLoadResult.setCapacityRemark(capacityName);
+                }
             }
         }
         tmstruckLoadResult.setInsertUpdateRemark((String) map.get("insertUpdateRemark"));

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;
@@ -59,12 +64,48 @@ import java.util.SimpleTimeZone;
          * @throws Exception
          */
         public static void main(String[] args) throws Exception {
-            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";
+            System.out.println(System.currentTimeMillis());
+            String sign = appkey + System.currentTimeMillis() + 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}
@@ -2020,7 +2031,6 @@
                               ON TTR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
                     WHERE ASO.SALE_TYPE = 1
                           AND ASO.DELETED = 0
-                          AND ASM.DELETED IS NULL
                     <if test="oneDate != null">
                         and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = ASOM.SALE_DATE_OF_RECEIPT
                     </if>