Redeem 1 mesiac pred
rodič
commit
bd1ad789b8

+ 2 - 0
src/main/java/com/steerinfo/dil/mapper/OmsTransOrderMapper.java

@@ -372,4 +372,6 @@ public interface OmsTransOrderMapper extends IBaseMapper<OmsTransOrder, BigDecim
 
     List<Map<String, Object>> selectCorrectInfo(BigDecimal transOrderId);
 
+    List<Map<String, Object>> getCgDzTransOrderList(Map<String, Object> map);
+
 }

+ 6 - 1
src/main/java/com/steerinfo/dil/service/impl/OmsTransOrderServiceImpl.java

@@ -1707,7 +1707,12 @@ public class OmsTransOrderServiceImpl {
             mapList1.addAll(omsTransOrderMapper.getTimeTransOrderList(map));
             return mapList1;
         }else if("大宗计重".equals(map.get("workFlag"))) {
-            return omsTransOrderMapper.getDzTransOrderList(map);
+            List<Map<String,Object>> dzMapList =  omsTransOrderMapper.getDzTransOrderList(map);
+            List<Map<String,Object>> cgMapList =  omsTransOrderMapper.getCgDzTransOrderList(map);
+            if(cgMapList != null) {
+                dzMapList.addAll(cgMapList);
+            }
+            return dzMapList;
         }else if("计次".equals(map.get("billingType"))){
             //针对计次,高线一车间看一车间数据,二车间看二车间数据
             List<Map<String,Object>> mapList1 = new ArrayList<>();

+ 24 - 0
src/main/java/com/steerinfo/dil/service/impl/TmsWeightResultServiceImpl.java

@@ -217,6 +217,12 @@ public class TmsWeightResultServiceImpl {
                         omsOrderChildService.updateOrderChildInfo(transOrderIds.get(0),item.getTransOrderChildId(),item.getNetWeightTime(),"净重");
                         OmsOrderChild omsOrderChild = omsOrderChildMapper.selectByPrimaryKey(transOrderChildId);
                         omsOrderChild.setNetWeight(item.getNetWeight());
+                        OmsTransOrder omsTransOrder = omsTransOrderMapper.selectByPrimaryKey(omsOrderChild.getTransOrderId());
+                        try {
+                            omsTransOrderService.matchLoaderCapacityOrder(omsTransOrder,omsOrderChild);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
                         omsOrderChild.setActualWeight(DataChange.dataToBigDecimal(item.getAlternateFields11()).compareTo(BigDecimal.ZERO) == 0 ? item.getNetWeight() : DataChange.dataToBigDecimal(item.getAlternateFields11()));
                         omsOrderChildMapper.updateByPrimaryKeySelective(omsOrderChild);
                         map.put("resultId",item.getResultId());//返回给日志记录
@@ -341,6 +347,12 @@ public class TmsWeightResultServiceImpl {
                         omsOrderChildService.updateOrderChildInfo(transOrderIds.get(0),item.getTransOrderChildId(),item.getNetWeightTime(),"净重");
                         OmsOrderChild omsOrderChild = omsOrderChildMapper.selectByPrimaryKey(transOrderChildId);
                         omsOrderChild.setNetWeight(item.getNetWeight());
+                        OmsTransOrder omsTransOrder = omsTransOrderMapper.selectByPrimaryKey(omsOrderChild.getTransOrderId());
+                        try {
+                            omsTransOrderService.matchLoaderCapacityOrder(omsTransOrder,omsOrderChild);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
                         omsOrderChild.setActualWeight(DataChange.dataToBigDecimal(item.getAlternateFields11()).compareTo(BigDecimal.ZERO) == 0 ? item.getNetWeight() : DataChange.dataToBigDecimal(item.getAlternateFields11()));
                         omsOrderChildMapper.updateByPrimaryKeySelective(omsOrderChild);
                         map.put("resultId",item.getResultId());//返回给日志记录
@@ -414,6 +426,12 @@ public class TmsWeightResultServiceImpl {
                         tmsWeightResultMapper.updateByPrimaryKeySelective(item);
                         OmsOrderChild omsOrderChild = omsOrderChildMapper.selectByPrimaryKey(transOrderChildId);
                         omsOrderChild.setNetWeight(item.getNetWeight());
+                        OmsTransOrder omsTransOrder = omsTransOrderMapper.selectByPrimaryKey(omsOrderChild.getTransOrderId());
+                        try {
+                            omsTransOrderService.matchLoaderCapacityOrder(omsTransOrder,omsOrderChild);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
                         omsOrderChild.setActualWeight(DataChange.dataToBigDecimal(item.getAlternateFields11()).compareTo(BigDecimal.ZERO) == 0 ? item.getNetWeight() : DataChange.dataToBigDecimal(item.getAlternateFields11()));
                         omsOrderChildMapper.updateByPrimaryKeySelective(omsOrderChild);
                         map.put("resultId",item.getResultId());//返回给日志记录
@@ -501,6 +519,12 @@ public class TmsWeightResultServiceImpl {
                         tmsWeightResultMapper.updateByPrimaryKeySelective(item);
                         OmsOrderChild omsOrderChild = omsOrderChildMapper.selectByPrimaryKey(transOrderChildId);
                         omsOrderChild.setNetWeight(item.getNetWeight());
+                        OmsTransOrder omsTransOrder = omsTransOrderMapper.selectByPrimaryKey(omsOrderChild.getTransOrderId());
+                        try {
+                            omsTransOrderService.matchLoaderCapacityOrder(omsTransOrder,omsOrderChild);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
                         omsOrderChild.setActualWeight(DataChange.dataToBigDecimal(item.getAlternateFields11()).compareTo(BigDecimal.ZERO) == 0 ? item.getNetWeight() : DataChange.dataToBigDecimal(item.getAlternateFields11()));
                         omsOrderChildMapper.updateByPrimaryKeySelective(omsOrderChild);
                         map.put("resultId",item.getResultId());//返回给日志记录

+ 171 - 0
src/main/resources/com/steerinfo/dil/mapper/OmsTransOrderMapper.xml

@@ -6883,4 +6883,175 @@
     ON OOC.TRANS_ORDER_ID = OTO.TRANS_ORDER_ID
     WHERE OTO.TRANS_ORDER_ID = #{transOrderId}
   </select>
+  <select id="getCgDzTransOrderList" resultType="java.util.Map">
+    SELECT *
+    FROM
+    (
+    SELECT DISTINCT
+    OTO.TRANS_ORDER_ID "transOrderId",
+    OTO.SERIAL_NUMBER "transOrderNumber",
+    RCA .REMARK1 "remark1",
+    OTO.DRIVER_NAME  "driver",
+    1 "truckNumber",
+    OTO.CAPACITY_NUMBER "capacityNumber",
+    CASE WHEN OTO.DRIVER_ID IS NULL or oto.CAPACITY_ID is null
+    then '未匹配到'
+    else '匹配到'
+    end "alternateFields25",
+    OTO. DRIVER_PHONE "jobNumber1",
+    OTO.IDENTITY_CARD  "identityCard",
+    OTO.DRIVER_PHONE  "personnelPhone",
+    ATR.BUSINESS_COMPANY_NAME "businessCompany",
+    ATR.BUSINESS_COMPANY_ID   "businessCompanyId",
+    ATR.SHIPPING_COMPANY_NAME "shippingCompany",
+    ATR.SHIPPING_COMPANY_ID   "shippingCompanyId",
+    ATR.RECEIVING_COMPANY_ID   "receivingCompanyId",
+    ATR.RECEIVING_COMPANY_NAME "receivingCompany",
+    ATP.SERIAL_NUMBER "planSerialNumber",
+    ATR .SERIAL_NUMBER "requireSerialNumber",
+    ATR.BILLING_TYPE "billingType",
+    OOC.MATERIAL_CODE "materialCode",
+    OOC.MATERIAL_ID    "materialId",
+    OOC .MATERIAL_NAME "materialName",
+    OOC .MATERIAL_MODEL "materialModel",
+    OOC .MATERIAL_SPECIFICATION "materialSpecification",
+    ARC.SHIPPING_POINT_ID "shippingPointId",
+    ARC.SHIPPING_POINT_ID "loadPointId",
+    ARC.SHIPPING_POINT_NAME "shippingPointName",
+    ARC.RECEIVING_POINT_ID "receivingPointId",
+    ARC.RECEIVING_POINT_ID "unloadPointId",
+    ARC.RECEIVING_POINT_NAME "receivingPointName",
+    ARC.OPERATIONS_NAME_ID "materialTypeId",
+    OOC.MATERIAL_NUMBER "materialNumber",
+    OOC.ORIGIN_MATERIAL_ZJS "originMaterialZjs",
+    OOC.ORIGIN_POUND_NO "originPoundNo",
+    OOC.ORIGIN_DATE "originDate",
+    ATP.CARRIER_ID "carrierId",
+    ATP.CARRIER_NAME "carrierName",
+    OTO .CAPACITY_ID "capacityId",
+    OTO .DRIVER_ID "driverId",
+    OTO.ORDER_TYPE "orderType",
+    OTO.ISSUE_TIME "issueTime",
+    OTO.ORDER_STATUS "orderStatus",
+    OTO.CONFIRM_REASON "confirmReason",
+    OTO.DRIVER_CONFIRM_TIME "driverConfirmTime",
+    OTO.APPOINT_OPERATION_TIME "appointOperationTime",
+    OTO.DELETE_REASON "deleteReason",
+    OTO.CURRENT_LINE_SEQ "currentLineSeq",
+    ATR .BUSINESS_TYPE "businessType",
+    OTO.DELETED "deleted",
+    OOC.ORDER_CHILD_ID "transOrderChildId",
+    OOC.PLAN_CHILD_ID "planChildId",
+    ATR.TRANS_REQUIREMENT_ID "requirementId",
+    ATP.TRANS_PLAN_ID "planId",
+    OTO .BUSINESS_TYPE_NAME "businessTypeName",
+    OTO.BUSINESS_SCENE    "businessScene",
+    ARC.OPERATIONS_RANGE "transRangeId",
+    ARC.OPERATION_NAME    "materialTypeName",
+    RCT.CAPACITY_TYPE_NAME    "capacityTypeName",
+    RCT.CAPACITY_TYPE_ID "capacityTypeId",
+    OOC.INSERT_UPDATE_REMARK "remark",
+    OOC.MATERIAL_WEIGHT "materialWeight",
+    OOC.NET_WEIGHT "netWeight",
+    OOC.ACTUAL_WEIGHT "actualWeight",
+    OOC.INSERT_TIME "createTime",
+    OOC.INSERT_USERNAME "createName",
+    OTO.INSERT_USERNAME "insertUsername",
+    ARC.RECEIVING_POINT_NAME "arrive",
+    ATR.ALTERNATE_FIELDS7 "rootCompanyId",
+    ATR.ALTERNATE_FIELDS13 "alternateFields13",
+    OTO.ALTERNATE_FIELDS26 "alternateFields26",
+    OTO.ALTERNATE_FIELDS27 "alternateFields27",
+    OTO.ALTERNATE_FIELDS4 "alternateFields4",
+    OTO.ALTERNATE_FIELDS5 "alternateFields5",
+    RTR.TRANS_RANGE_NAME "transRangeName"
+    FROM OMS_TRANS_ORDER OTO
+    LEFT JOIN OMS_ORDER_CHILD OOC ON OOC .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID
+    LEFT JOIN AMS_PLAN_CHILD APC ON APC .PLAN_CHILD_ID = OOC .PLAN_CHILD_ID
+    LEFT JOIN AMS_TRANS_PLAN ATP ON ATP .TRANS_PLAN_ID = APC .TRANS_PLAN_ID
+    LEFT JOIN AMS_REQUIREMENT_CHILD ARC ON ARC .REQUIREMENT_CHILD_ID = APC .REQUIREMENT_CHILD_ID
+    LEFT JOIN RMS_TRANS_RANGE RTR ON RTR.TRANS_RANGE_ID = to_number(nvl(ARC.OPERATIONS_RANGE,0))
+    LEFT JOIN AMS_TRANS_REQUIREMENT ATR ON ATR .TRANS_REQUIREMENT_ID = ARC .TRANS_REQUIREMENT_ID
+    LEFT JOIN RMS_CAPACITY RCA ON RCA .CAPACITY_ID = OTO .CAPACITY_ID
+    LEFT JOIN RMS_CAPACITY_TYPE RCT ON RCA.CAPACITY_TYPE_ID = RCT.CAPACITY_TYPE_ID
+    LEFT JOIN DIL_CONTRASTING_RELATION DCR  ON ATR.SERIAL_NUMBER = DCR.WEIGHT_SERIAL_NUMBER
+    WHERE OTO.DELETED = 2
+    AND DCR.WEIGHT_SCENE = '采购'
+    AND DCR.WEIGHT_SERIAL_NUMBER IS NOT NULL
+    AND ATR.BUSINESS_SCENE = '采购'
+    and ATR.TRANS_REQUIREMENT_ID IS NOT NULL
+    order by OTO.DRIVER_ID NULLS FIRST
+    )
+    <where>
+      <if test="orderId !=null and orderId !=''">
+        AND "orderId" = #{orderId}
+      </if>
+      <if test="deleted != null and deleted != ''">
+        and "deleted" = #{deleted}
+      </if>
+      <if test="transOrderId !=null and transOrderId !=''">
+        AND "transOrderId" = #{transOrderId}
+      </if>
+      <if test="transOrderNumber !=null and transOrderNumber !=''">
+        AND REGEXP_LIKE("transOrderNumber",#{transOrderNumber})
+      </if>
+      <if test="materialName !=null and materialName !=''">
+        AND REGEXP_LIKE("materialName",#{materialName})
+      </if>
+      <if test="alternateFields13 !=null and alternateFields13 !=''">
+        AND REGEXP_LIKE("alternateFields13",#{alternateFields13})
+      </if>
+      <if test="alternateFields25 !=null and alternateFields25 !=''">
+        AND REGEXP_LIKE("alternateFields25",#{alternateFields25})
+      </if>
+      <if test="capacityNumber !=null and capacityNumber !=''">
+        AND REGEXP_LIKE("capacityNumber",#{capacityNumber})
+      </if>
+      <if test="driver !=null and driver !=''">
+        AND REGEXP_LIKE("driver",#{driver})
+      </if>
+      <if test="orderType !=null and orderType !=''">
+        AND REGEXP_LIKE("orderType",#{orderType})
+      </if>
+      <if test="businessType !=null and businessType !=''">
+        AND "businessType" = #{businessType}
+      </if>
+      <if test="businessScene !=null and businessScene !=''">
+        AND "businessScene" = #{businessScene}
+      </if>
+      <if test="status !=null and status !=''">
+        <if test="terminalCode != 'app'">
+          AND REGEXP_LIKE("status",#{status})
+        </if>
+        <if test="terminalCode == 'app'">
+          <if test="status == '未确认'">
+            AND (REGEXP_LIKE("status",#{status}) OR "isBanStr" = '已禁用')
+          </if>
+          <if test="status == '已确认'">
+            AND REGEXP_LIKE("status",#{status}) AND "isBanStr" = '未禁用'
+          </if>
+        </if>
+      </if>
+      <if test="statusList != null and statusList.size > 0">
+        AND "status" in
+        <foreach collection="statusList" index="index" item="item" separator="," close=")" open="(">
+          #{item}
+        </foreach>
+      </if>
+      <if test="orderStatus !=null and orderStatus !=''">
+        AND REGEXP_LIKE("orderStatus",#{orderStatus})
+      </if>
+      <if test="jobNumber !=null and jobNumber !=''">
+        AND ( REGEXP_LIKE("jobNumber1",#{jobNumber}) OR REGEXP_LIKE("jobNumber3",#{jobNumber}) )
+      </if>
+      <if test="billingType !=null and billingType !=''">
+        AND REGEXP_LIKE("billingType" || "businessTypeName",#{billingType})
+      </if>
+      <if test="issueTime !=null">
+        AND "issueTime" >= to_date(#{issueTime[0]}, 'yyyy-mm-dd hh24:mi:ss')
+        AND to_date(#{issueTime[1]}, 'yyyy-mm-dd hh24:mi:ss')  >= "issueTime"
+      </if>
+    </where>
+    <include refid="orderBy"></include>
+  </select>
 </mapper>