'销售钢材'

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

@@ -1294,4 +1294,30 @@ public class OmstruckOrderController extends BaseRESTfulController {
             return success(result);
         }
     }
+
+    //销售物流接收订单，订单类型为已下发，司机接单状态为已下发，未下发。
+    @ApiOperation(value = "出库信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(226)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getWarehouseMes")
+    public RESTfulResult getWarehouseMes(@RequestBody(required = false) Map<String, Object> mapValue,
+                                         String startTime,
+                                         String endTime,
+                                         String con
+    ) {
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
+        if (con != null && (con.equals("") || con.equals("undefined") || con.equals("null"))) {
+            con = null;
+        }
+        if (con != null && con.length() != 0) {
+            mapValue.put("con", "%" + con + "%");
+        }
+        //分页数据
+        List<Map<String, Object>> mapList = omstruckOrderService.getWarehouseMes(mapValue);
+        return success(mapList);
+    }
 }

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

@@ -54,7 +54,7 @@ public class OmstruckOrderMaterialController extends BaseRESTfulController {
         return success(map);
     }
 
-    @ApiOperation(value = "查询钢材订单信息")
+    @ApiOperation(value = "修改提货单信息")
     @PostMapping("updateMaterialMes")
     public RESTfulResult updateMaterialMes(@RequestBody(required = false) Map<String, Object> map){
         int i = omstruckOrderMaterialService.updateMaterialMes(map);

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

@@ -345,4 +345,6 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     // 通过运单id或者运单号查询车辆是否放行
     String canCapacityEnfactory(Map<String, Object> mapValue);
+    // 出库信息
+    List<Map<String, Object>> getWarehouseMes(Map<String, Object> mapValue);
 }

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

@@ -207,4 +207,6 @@ public interface IOmstruckOrderService {
 
     List<Map<String, Object>> getDriverInfoForSale2(Map<String, Object> mapValue);
     List<Map<String, Object>> getTransportOrder(Map<String, Object> mapValue);
+    // 出库信息
+    List<Map<String, Object>> getWarehouseMes(Map<String, Object> mapValue);
 }

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

@@ -308,7 +308,7 @@ public class OmstruckOrderMaterialServiceImpl implements IOmstruckOrderMaterialS
                 if (materialWeight.intValue() != 0) { //如果总重量不为0，才进行重量更新
                     BigDecimal orderMaterialNumber = DataChange.dataToBigDecimal(saleMaterialMes.get("orderMaterialNumber"));//旧件数
                     BigDecimal theoreticalWeight = materialWeight.multiply(materialNum);
-                    newWeight =  theoreticalWeight.divide(orderMaterialNumber, 4);//得到现有理重
+                    newWeight =  theoreticalWeight.divide(orderMaterialNumber,3, 4);//得到现有理重
                     omstruckOrderMaterial.setOrderMaterialWeight(newWeight);
                 }
                 //修改销售订单物资子表
@@ -332,7 +332,7 @@ public class OmstruckOrderMaterialServiceImpl implements IOmstruckOrderMaterialS
                 if (materialWeight.intValue() != 0) { //如果总重量不为0，才进行重量更新
                     BigDecimal orderMaterialNumber = DataChange.dataToBigDecimal(saleMaterialMes.get("materialNumber"));//旧件数
                     BigDecimal theoreticalWeight = materialWeight.multiply(materialNum);
-                    newWeight =  theoreticalWeight.divide(orderMaterialNumber, 4);//得到现有理重
+                    newWeight =  theoreticalWeight.divide(orderMaterialNumber,2, 4);//得到现有理重
                 }
                 //修改销售订单物资子表
                 omstruckOrderMaterialMapper.updateSaleOrderMaterialMes(saleMaterialId, materialNum, newWeight);

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

@@ -787,6 +787,16 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         return omstruckOrderMapper.getTransportOrder(mapValue);
     }
 
+    /**
+     * 出库信息
+     * @param mapValue
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getWarehouseMes(Map<String, Object> mapValue) {
+        return omstruckOrderMapper.getWarehouseMes(mapValue);
+    }
+
     /**
      * 销售物流，下发订单
      *

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

@@ -2033,7 +2033,8 @@
         ASM.SALE_WAREHOUSE "warehouse",
         ASM.MATERIAL_WEIGHT "materialWeight",
         TWR.RESULT_NET_WEIGHT "netWeight",
-        OO.ORDER_LINE_SEQUENCE "lineSequence"
+        OO.ORDER_LINE_SEQUENCE "lineSequence",
+        ASM.DELETED "materialStatus"
         FROM AMS_SALE_ORDER_MATERIAL ASOM
         LEFT JOIN OMSTRUCK_ORDER OO
         ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
@@ -3994,4 +3995,65 @@
         </where>
     </select>
 
+    <select id="getWarehouseMes" parameterType="java.util.Map" resultType="java.util.Map" >
+        SELECT DISTINCT * FROM (
+        SELECT OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        OO.ORDER_ID "orderId",
+        WOR.RESULT_ID "outboudId",
+        WORM.RESULT_MATERIAL_ID "outboudMaterialId",
+        OOM.ORDER_MATERIAL_NUMBER "materialNumber",
+        OOM.ORDER_MATERIAL_WEIGHT "materialWeight",
+        RM.MATERIAL_ID "materialId",
+        RM.MATERIAL_NAME "materialName",
+        RM.MATERIAL_SPECIFICATION "materialSpecification",
+        RM.MATERIAL_MODEL "materialModel",
+        RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "specificationModel",
+        TWR.RESULT_GROSS_WEIGHT "grossWeight",
+        TWR.RESULT_GROSS_WEIGHT_TIME "grossWeightTime",
+        TWR.RESULT_TARE_WEIGHT       "tareWeight",
+        TWR.RESULT_TARE_WEIGHT_TIME  "tareWeightTime",
+        TWR.RESULT_NET_WEIGHT        "netWeight",
+        TLR.RESULT_LOAD_END_TIME     "loadTime",
+        TLFR.RESULT_OUT_GATE_TIME    "outGateTime",
+        TER.RESULT_ENTRY_GATE_TIME   "entryGateTime"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON OO.ORDER_ID = TTR.ORDER_ID
+        LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+        ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+        ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+        ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        AND OOM.MATERIAL_ID = TWR.MATERIAL_ID
+        LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
+        ON TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        AND OOM.MATERIAL_ID = TLR.MATERIAL_ID
+        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+        ON OOM.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN WMSP_OUTBOUND_RESULT WOR
+        ON WOR.BILL_LADING_ID = OO.ORDER_ID
+        LEFT JOIN WMSP_OUTBOUND_RESULT_MATERIAL WORM
+        ON WORM.OUTBOUND_RESULT_ID = WOR.RESULT_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        WHERE OO.ORDER_STATUS = 5
+        AND OO.ORDER_TYPE = 1
+        <if test="con != null">
+            and RC.CAPACITY_NUMBER || RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL LIKE #{con}
+        </if>
+        <if test="oneDate != null">
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= OO.INSERT_TIME
+        </if>
+        <if test="startDate != null">
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= OO.INSERT_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= OO.INSERT_TIME
+        </if>
+        )
+        ORDER BY "orderNumber" DESC
+    </select>
+
 </mapper>