修改短信，进厂框计算

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

@@ -46,7 +46,7 @@ public class TmstruckEnfactoryResultController extends BaseRESTfulController {
     @ApiOperation(value="查询所有的进厂实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(99)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId(210)", value = "动态表头", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
@@ -126,4 +126,14 @@ public class TmstruckEnfactoryResultController extends BaseRESTfulController {
         return success(i);
     }
 
+    @ApiOperation(value="通过运输订单id查询物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderId", value = "运输订单id", required = false, dataType = "Integer"),
+    })
+    @GetMapping("/getMaterial")
+    public RESTfulResult getMaterial(Integer orderId){
+        List<Map<String, Object>> material = tmstruckEnfactoryResultService.getMaterial(orderId);
+        return success(material);
+    }
+
 }

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

@@ -36,4 +36,8 @@ public interface TmstruckEnfactoryResultMapper extends IBaseMapper<TmstruckEnfac
     //查找排队序号
     Integer selectNodeNumber(String orderNumber);
 
+    //通过运输订单id查询物资信息
+    List<Map<String,Object>> getMaterial(Integer orderId);
+
+
 }

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

@@ -22,7 +22,8 @@ import java.util.Map;
 public interface ITmstruckEnfactoryResultService{
     //通过订单类型获取进厂实绩
     List<Map<String, Object>> getAllEnFactoryResult(Map<String, Object> map);
-
+    //通过运输订单id查询物资信息
+    List<Map<String, Object>> getMaterial(Integer orderId);
     //新增进厂作业
     int addEnFactoryResult(Map<String, Object> map);
 

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

@@ -115,6 +115,15 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         return null;
     }
 
+    /**
+     * 通过运输订单id查询物资信息
+     * @param orderId
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getMaterial(Integer orderId) {
+        return tmstruckEnfactoryResultMapper.getMaterial(orderId);
+    }
 
 
     /**
@@ -236,4 +245,5 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         tmstruckEnfactoryResult.setInsertUsername("admin");
         return tmstruckEnfactoryResultMapper.updateByPrimaryKeySelective(tmstruckEnfactoryResult);
     }
+
 }

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

@@ -93,8 +93,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         Integer orderType = (Integer) map.get("orderTypee");
         switch (orderType){
             case 1:
-
-                break;
+                return tmstruckLeaveFactoryResultMapper.selectAllLeaveFacatoryForSale(map);
             case 2:
 
                 break;

src/main/resources/bootstrap.yml

@@ -16,7 +16,7 @@ spring:
 #feign设置
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:localhost:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   BmsShipFeign:
     url: ${BMSSHIPFEIGN_URL:localhost:8078}
   BmsTruckFeign:

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

@@ -680,6 +680,7 @@
         TER.RESULT_ID "resultId",
         ASO.SALE_NUMBER "saleNumber",
         RM.MATERIAL_NAME "materialName",
+        OO.ORDER_ID "orderId",
         OO.ORDER_NUMBER "orderNumber",
         RC.CAPACITY_NUMBER "capacityNumber",
         RG.GATEPOST_NAME "gatepostName",
@@ -775,4 +776,17 @@
         </where>
         <include refid="orderByEnterTime"></include>
     </select>
+
+    <select id="getMaterial" parameterType="int" resultType="java.util.Map">
+        SELECT
+            RM.MATERIAL_NAME "materialName",
+            CONCAT(CONCAT(RM.MATERIAL_SPECIFICATION , '('), CONCAT(RM.MATERIAL_MODEL ,')')) "specificationModel",
+            OM.ORDER_MATERIAL_NUMBER "orderMaterialNumber"
+        FROM OMSTRUCK_ORDER OO
+            LEFT JOIN OMSTRUCK_ORDER_MATERIAL OM
+            ON OO.ORDER_ID = OM.ORDER_ID
+            LEFT JOIN RMS_MATERIAL RM
+            ON OM.MATERIAL_ID = RM.MATERIAL_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
 </mapper>

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

@@ -617,7 +617,7 @@
                     OO.ORDER_NUMBER "orderNumber",
                     RC.CAPACITY_NUMBER "capacityNumber",
                     RG.GATEPOST_NAME "gatepostName",
-                    ARD.DAYPLAN_MATERIAL_WEIGHT "materialWeight",
+                    OOM.ORDER_MATERIAL_WEIGHT "",
                     TLFR.RESULT_OUT_MODE "resultOutMode",
                     TLFR.RESULT_OUT_GATE_TIME "resultOutGateTime",
                     TLFR.RESULT_TRUCK_SNAPSHOT_PICTURE "resultTruckSnapshotPicture"
@@ -625,14 +625,49 @@
                     TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
                         LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.RESULT_TOTAL_ID = TLFR.RESULT_TOTAL_ID
                         LEFT JOIN OMSTRUCK_ORDER OO ON OO.ORDER_ID = TTR.ORDER_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_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
                         LEFT JOIN RMS_GATEPOST RG ON RG.GATEPOST_ID = TLFR.GATEPOST_ID
-                        LEFT JOIN AMSTRUCK_RAIL_DAYPLAN  ARD ON ARD.DAYPLAN_ID=OO.ORDER_PLAN_ID
+                        LEFT JOIN AMS_SALE_ORDER ASO ON OO.ORDER_PLAN_ID = ASO.SALE_ORDER_ID
                 WHERE
-                    RESULT_OUT_GATE_TIME IS NOT NULL
+                    RESULT_OUT_GATE_TIME IS NOT NULL  and OO.ORDER_TYPE in (1, 2, 3)
             )
+        <where>
+            <if test="dayplanNo != null">
+                <foreach collection="dayplanNo" item="item" open="(" separator="or" close=")">
+                    "dayplanNo" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="purchaseOrderNo != null">
+            and
+                <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
+                    "purchaseOrderNo" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="purchaseOrderNo != null">
+            and
+                <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
+                    "purchaseOrderNo" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="purchaseOrderNo != null">
+                and
+                <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
+                    "purchaseOrderNo" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="purchaseOrderNo != null">
+                and
+                <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
+                    "purchaseOrderNo" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="purchaseOrderNo != null">
+                and
+                <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
+                    "purchaseOrderNo" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
     </select>
 </mapper>