修改

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

@@ -57,4 +57,15 @@ public class TmstruckMeasureCommissionController extends BaseRESTfulController {
         int i = tmstruckMeasureCommissionService.addMaoMeasureCommission(map);
         return success(i);
     }
+    @ApiOperation(value="发送计量委托 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/sendMeasureCommission")
+    public RESTfulResult sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map){
+        int i = tmstruckMeasureCommissionService.sendMeasureCommssion(map);
+        return success(i);
+    }
+
+
 }

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

@@ -73,6 +73,8 @@ public interface TmstruckMeasureCommissionMapper extends IBaseMapper<TmstruckMea
     //内转计量委托(老厂区)
     Map<String,Object> purchaseXqCgNzMeasure(Map<String,Object> map);
 
+    //纯内转发送计量委托
+    Map<String,Object> purchaseNzMeasure(Map<String,Object> map);
     //内转
     Integer getReceiveIdByRequirementOrderId(Object orderId);
 

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

@@ -28,4 +28,7 @@ public interface ITmstruckMeasureCommissionService{
     //添加计毛委托
     int addMaoMeasureCommission(Map<String, Object> map);
 
+    //发送计量委托
+    int sendMeasureCommssion(Map<String,Object> map);
+
 }

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

@@ -103,6 +103,32 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         }
         return i;
     }
+    //发送计量委托
+    @Override
+    public int sendMeasureCommssion(Map<String, Object> map) {
+        //获取订单类型
+        Integer orderType = (Integer) map.get("orderTypee");
+        switch (orderType.intValue()){
+            case 1:
+            case 2:
+            case 3:addXSMeasureCommission(map);
+                   break;
+            case 12:
+            case 13:
+            case 15:
+            case 16:addLXMeasureCommission(map);
+                    break;
+            case 5:
+            case 6:
+            case 7:
+            case 8:
+            case 9:
+            case 17:
+            case 18:
+
+        }
+        return 0;
+    }
 
 
     /**
@@ -231,7 +257,16 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 break;
             case 10:
                 break;
-            case 11:
+            case 11://纯内转发送计量委托
+                 measureCommission=tmstruckMeasureCommissionMapper.purchaseNzMeasure(map);
+                 measureCommission.put("isRelationEAS", false);
+                 measureCommission.put("flowTo", "进厂");
+                 measureCommission.put("isDel", false);
+                 measureCommission.put("isInsert", true);
+                 measureCommission.put("IsAssembly", false);
+                 measureCommission.put("deliveryMethod", "磅重交货");
+                 measureCommission.put("packagesNum", 0);
+                 break;
             case 4:
                 break;
             case 5:

src/main/resources/application-dev.yml

@@ -39,7 +39,7 @@ openfeign:
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.162:8015}
+    url: ${AMSFEIGN_URL:localhost:8015}
 
 server:
   port: 8008

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

@@ -962,7 +962,6 @@
         on RC.CAPACITY_ID = OO.CAPACITY_ID
         left join RMS_GATEPOST RG
         on RG.GATEPOST_ID = TLFR.GATEPOST_ID
-
         where RESULT_OUT_GATE_TIME is not null
         and OO.ORDER_TYPE = 11
         )

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

@@ -1138,8 +1138,51 @@
                     OO.ORDER_ID = #{orderId}
                 ORDER BY
                     TWR.TARE_SEGMENT_SQE DESC
+                )
+        WHERE
+            ROWNUM = 1
+    </select>
+    <select id="purchaseNzMeasure" resultType="java.util.Map" parameterType="java.math.BigDecimal">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    OO.ORDER_NUMBER "transportNum",
+                    RC.CAPACITY_NUMBER "carNum",
+                    APO.PURCHASE_ORDER_NO "purchaseOrder",
+                    RS.SUPPLIER_NAME "sendUnit",
+                    RCE.CONSIGNEE_COMPANY_NAME "ReceivUnit",
+                    RW.WAREHOUSE_NAME "unloadPlace",
+                    TWR.INSERT_UPDATE_REMARK "demo",
+                    RM.MATERIAL_ID "materialId",
+                    RM.MATERIAL_NAME "materiaName",
+                    concat( RM.MATERIAL_SPECIFICATION, RM.MATERIAL_MODEL ) "goodsType",
+                    RTC.TRUCK_CALCULATE_NUMBER "steelyardNum"
+                FROM
+                    OMSTRUCK_ORDER OO
+                        LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                        LEFT JOIN AMSTRUCK_INWARD_PLAN AIP ON AIP.PLAN_ID = OO.ORDER_PLAN_ID
+                        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP ON ARP.PLAN_ID = AIP.PLAN_ID
+                        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+                        LEFT JOIN AMS_PURCHASE_ORDER APO ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
+                        LEFT JOIN RMS_SUPPLIER RS ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+                        LEFT JOIN RMS_CONSIGNEE RCE ON RCE.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
+                        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
+                        LEFT JOIN TMSTRUCK_UNLOAD_RESULT TUR ON TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                        LEFT JOIN RMS_WAREHOUSE RW ON RW.WAREHOUSE_ID = AIR.REQUIREMENT_UNLOAD_UNIT_ID
+                        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                        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 RMS_TRUCK_CALCULATE RTC ON RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
+                WHERE
+                    OO.ORDER_ID = #{orderId}
+                ORDER BY
+                    TWR.TARE_SEGMENT_SQE DESC,
+                    OOM.MATERIAL_PRIORITY DESC
             )
         WHERE
             ROWNUM = 1
     </select>
+
 </mapper>