Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

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

@@ -544,7 +544,7 @@ public class StatisticalReportController extends BaseRESTfulController {
                                                     Integer pageSize,
                                                     String startTime,
                                                     String endTime,
-                                                   String con
+                                                    String con
     ){
         if (con != null && !"undefined".equals(con)) {
             mapValue.put("con",con);

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

@@ -392,4 +392,14 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, LoadingResult,loadResult);
         return success(pageList);
     }
+
+    @ApiOperation(value = "新增装货")
+    @PostMapping("/addLoad")
+    public RESTfulResult addLoad(@RequestBody(required=false) Map<String, Object> map){
+        int i = tmstruckLoadResultService.addLoad1(map);
+        if(i == 1) {
+            return success("装货成功");
+        }
+        return failed("装货失败");
+    }
 }

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

@@ -53,10 +53,10 @@ public interface TmstruckLeaveFactoryResultMapper extends IBaseMapper<TmstruckLe
     List<Map<String,Object>> getDeliveryOrderMaterial(String orderNumber);
 
     //根据运输订单号查找过磅重量
-    Map<String,Object> getNetWeightByOrder(Map<String,Object> map);
+    List<Map<String,Object>> getNetWeightByOrder(Map<String,Object> map);
 
     //根据运输订单查找物资理重
-    String getTheoryWeight(Map<String,Object> map);
+    List<Map<String, Object>> getTheoryWeight(Map<String,Object> map);
 
 
 
@@ -81,4 +81,12 @@ public interface TmstruckLeaveFactoryResultMapper extends IBaseMapper<TmstruckLe
     BigDecimal getSaleOrderId(String orderNumber);
 
     Integer getOrderStatus(BigDecimal orderId);
+
+    /**
+     * @author:zyf
+     * @version:1.0
+     * @Date:
+     * @Description:查询出备注
+    */
+    String querynote(String orderNumber);
 }

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

@@ -87,4 +87,7 @@ public interface ITmstruckLoadResultService{
    //查询采购内转装车实绩
     List<Map<String, Object>> getCgNzLoadingResult(Map<String, Object> mapval);
 
+    //插入装货
+    int addLoad1(Map<String,Object> map);
+
 }

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

@@ -14,6 +14,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -70,6 +72,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
     @Autowired
     private TmstruckUnloadResultMapper tmstruckUnloadResultMapper;
 
+
     /**
      * 生成销售装车实绩（虚拟装车实绩）
      * @param map
@@ -698,4 +701,52 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
     public List<Map<String, Object>> getCgNzLoadingResult(Map<String, Object> mapval) {
         return tmstruckLoadResultMapper.getCgNzLoadingResult(mapval);
     }
+
+    /**
+     * @author:zyf
+     * @version:1.0
+     * @Date:
+     * @Description:新增装货表
+    */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int addLoad1(Map<String, Object> map) {
+        //获取装货表主键ID
+        BigDecimal ResultId = tmstruckLoadResultMapper.selectMaxId();
+        TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
+        //总实绩ID 开始时间 结束时间 装车时长 物资Id 装卸工ID 装货点Id 备注
+        //主键ID
+        tmstruckLoadResult.setResultId(ResultId);
+        //装卸工ID
+        tmstruckLoadResult.setLoaderId(DataChange.dataToBigDecimal(map.get("loadId")));
+        //装货开始时间
+        SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String loadStartTime =(String) map.get("loadStartTime");
+        try {
+            Date loadStartTime1 = sdf2.parse(loadStartTime);
+            tmstruckLoadResult.setResultLoadStartTime(loadStartTime1);
+            //结束时间
+            Date loadEndTime = new Date();
+            tmstruckLoadResult.setResultLoadEndTime(loadEndTime);
+            //装货时长
+            long duration = (loadEndTime.getTime() - loadStartTime1.getTime()) / 60000;
+            tmstruckLoadResult.setResultLoadDuration(new BigDecimal(duration));
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        //总实绩ID
+        tmstruckLoadResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultid")));
+        //物资ID
+        tmstruckLoadResult.setMaterialId(BigDecimal.valueOf((int)map.get("materialId")));
+        //装货点ID
+        tmstruckLoadResult.setLoadingId(BigDecimal.valueOf((int)map.get("warehouseId")));
+        //理重
+        BigDecimal lz= (BigDecimal.valueOf((Double) map.get("calculateTW")));
+        tmstruckLoadResult.setResultMeasuredTonnage(lz);
+        int i=tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
+        if (i==1){
+            return i;
+        }
+        return 0;
+    }
 }

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

@@ -6,6 +6,7 @@ import com.steerinfo.dil.service.ITmstruckSelfMachineService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -43,26 +44,41 @@ public class TmstruckSelfMachineService implements ITmstruckSelfMachineService {
     public Map<String, Object> getDeliveryOrder(String orderNumber) {
         //1.根据运输订单号查询主干信息
         Map<String,Object> map = tmstruckLeaveFactoryResultMapper.getDeliveryOrder(orderNumber);
+        map.put("note",tmstruckLeaveFactoryResultMapper.querynote(orderNumber));
         map.put("orderNumber",orderNumber);
         if(map !=null){
             List<Map<String, Object>> deliveryOrderMaterialList = tmstruckLeaveFactoryResultMapper.getDeliveryOrderMaterial(orderNumber);
             //判断为棒材还是线材
             for (Map<String,Object> map1:deliveryOrderMaterialList){
-                map1.remove("materialWeight");
+                BigDecimal materialid = (BigDecimal) map1.get("materialid");
                 String materialName =(String) map1.get("materialName");
                 map.put("materialName",materialName);
                 //判断是否为盘螺
-                if (materialName.contains("盘螺")){
+                if (materialName.contains("盘螺")||materialName.contains("螺纹钢")||materialName.contains("盘元")){
                     //根据运输订单号查找实绩重量
-                    Map<String, Object> netWeight = tmstruckLeaveFactoryResultMapper.getNetWeightByOrder(map);
-                    String nowNetWeight =(String) netWeight.get("nowNetWeight");
-                    if (nowNetWeight!=null) {
-                        map.put("materialWeight", nowNetWeight);
+                    List<Map<String, Object>> netWeightlist = tmstruckLeaveFactoryResultMapper.getNetWeightByOrder(map);
+                    for (Map<String, Object> stringObjectMap : netWeightlist) {
+                        BigDecimal materialid1 = (BigDecimal) stringObjectMap.get("materialid");
+                        if (materialid.compareTo(materialid1) == 0) {
+                            BigDecimal nowNetWeight = (BigDecimal) stringObjectMap.get("nowNetWeight");
+                            if (nowNetWeight != null) {
+                                map1.put("materialWeight", nowNetWeight);
+                            }
+                        }
                     }
                 }else {
                     //获取物资理重
-                    String theoryWeight = tmstruckLeaveFactoryResultMapper.getTheoryWeight(map);
-                    map.put("materialWeight",theoryWeight);
+                    List<Map<String, Object>> theoryWeightlist = tmstruckLeaveFactoryResultMapper.getTheoryWeight(map);
+                    for (Map<String, Object> stringObjectMap : theoryWeightlist) {
+                        BigDecimal materialid1 = (BigDecimal) stringObjectMap.get("materialid");
+                        if (materialid.compareTo(materialid1) == 0){
+                            BigDecimal theoryWeight=(BigDecimal) stringObjectMap.get("theoryWeight");
+                            if (theoryWeight != null){
+                                map1.put("materialWeight",theoryWeight);
+                            }
+                        }
+                    }
+
                 }
             }
             map.put("deliveryOrderMaterialList",deliveryOrderMaterialList);

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

@@ -51,7 +51,7 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
     private BmsTruckFeign bmsTruckFeign;
     @Autowired
     private AmsFeign amsFeign;
-    private static final String TwoHour="16吨吊车,12吨吊车,35吨吊车,25吨吊车,70吨吊车,80吨吊车";
+    private static final String TwoHour="16吨吊车,12吨吊车,35吨吊车,25吨吊车,70吨吊车,80吨吊车,50吨吊车";
     private static final String FourHour="220吨吊车,130吨吊车,120吨吊车,150吨吊车,100吨吊车";
 
 

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

@@ -1087,7 +1087,8 @@
             rm.material_model "materialModel",
             oom.order_material_number "materialNumber",
             oom.order_material_weight "materialWeight",
-            tlr.RESULT_LOAD_START_TIME "makeDate"
+            tlr.RESULT_LOAD_START_TIME "makeDate",
+            oom.MATERIAL_ID "materialid"
         from omstruck_order oo
                  left join
              omstruck_order_material oom
@@ -1302,7 +1303,8 @@
 
    <!-- 获取物资实重-->
     <select id="getNetWeightByOrder" resultType="java.util.Map" parameterType="java.util.Map">
-        SELECT TWR.RESULT_NET_WEIGHT AS "nowNetWeight"
+        SELECT TWR.RESULT_NET_WEIGHT AS "nowNetWeight",
+        TWR.MATERIAL_ID AS "materialid"
         FROM OMSTRUCK_ORDER OO
         left join OMSTRUCK_ORDER_MATERIAL OOM
         ON OOM.ORDER_ID=OO.ORDER_ID
@@ -1315,8 +1317,9 @@
         WHERE OO.ORDER_NUMBER = #{orderNumber} and RM.MATERIAL_NAME=#{materialName}
     </select>
 <!--    获取物资理重-->
-    <select id="getTheoryWeight" resultType="java.lang.String" parameterType="java.util.Map">
-        select ASTM.MATERIAL_THEORETICAL_WEIGHT "theoreticalWeight"
+    <select id="getTheoryWeight" resultType="java.util.Map" parameterType="java.util.Map">
+        select ASTM.MATERIAL_THEORETICAL_WEIGHT "theoreticalWeight",
+        ASM.MATERIAL_ID "materialid"
        from OMSTRUCK_ORDER oo
        left join AMS_SALE_ORDER_MATERIAL ASOM
        ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
@@ -1330,4 +1333,12 @@
         ON RM.MATERIAL_ID=ASM.MATERIAL_ID
        where  oo.ORDER_NUMBER=#{orderNumber}  and RM.MATERIAL_NAME=#{materialName}
     </select>
+
+    <select id="querynote" resultType="java.lang.String">
+        select aso.sale_remark
+          from omstruck_order oo
+          left join AMS_SALE_ORDER aso
+          on aso.SALE_ORDER_ID=oo.order_plan_id
+         where oo.order_number = #{orderNumber}
+    </select>
 </mapper>