Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -2288,4 +2288,10 @@ public class AMScontroller{
         return amsFeign.splitOrder(map);
     }
 
+    @ApiOperation(value="修改零星物资订单")
+    @PostMapping("/batchUpdateCapacity")
+    public Map<String,Object> batchUpdateCapacity(@RequestBody Map<String,Object> mapValue) {
+        return amsFeign.batchUpdateCapacity(mapValue);
+    }
+
 }

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

@@ -19,10 +19,7 @@ import org.springframework.web.multipart.MultipartRequest;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author hujianguo
@@ -504,11 +501,11 @@ public class BMSController extends BaseRESTfulController {
 
     @PostMapping("addTruckStatement")
     @ApiOperation(value = "新增汽运账单")
-    RESTfulResult addTruckStatement(@RequestParam("excludeTax") BigDecimal excludeTax,@RequestParam("userId") String userId, @RequestParam("orderList")BigDecimal[] orderList, MultipartRequest request) {
+    RESTfulResult addTruckStatement(@RequestParam("excludeTax") BigDecimal excludeTax, @RequestParam("userId") String userId, @RequestParam("statementTime") String statementTime, @RequestParam("orderList")BigDecimal[] orderList, MultipartRequest request) {
         String url="";
         List<MultipartFile> files = new ArrayList<>();
         //获取图片
-        for(int i=0;i<=1;i++){
+        for(int i=0;i<=10;i++){
             MultipartFile temp = request.getFile("file"+i);
             if(temp!=null){
                 files.add(temp);
@@ -531,6 +528,7 @@ public class BMSController extends BaseRESTfulController {
         map.put("orderList",orderList);
         map.put("url",url);
         map.put("userId",userId);
+        map.put("statementTime",statementTime);
         return bmstruckFeign.addTruckStatement(map);
     }
 

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

@@ -8,6 +8,7 @@ import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -92,13 +93,43 @@ public class BackgroundProcessingController extends BaseRESTfulController {
 
     @ApiOperation(value = "更新运输订单状态接口")
     @PostMapping("updateOrderStatus")
-    public RESTfulResult updateOrderStatus(@RequestBody(required = false) Map<String,Object> map){
-        if(map.get("orderNumber") != null){
-            if(DataChange.dataToBigDecimal(map.get("orderStatus")).intValue() != 2) {
+    @Transactional(rollbackFor = Exception.class)
+    public RESTfulResult updateOrderStatus(@RequestBody(required = false) Map<String,Object> map) throws Exception{
+        if (map.get("orderNumber") != null) {
+            if (DataChange.dataToBigDecimal(map.get("orderStatus")).intValue() != 2) {
                 int i = backgroundProcessingMapper.updateOrderStatus(map);
+                if(i > 1){
+                    throw new Exception("该订单号有多个运单，不允许修改，请去数据库手动修改订单状态！");
+                }
                 return success(i);
             }
         }
         return failed(0);
     }
+
+    @ApiOperation(value = "内转/采购新增上传金蝶表")
+    @PostMapping("insertToUploadEas")
+    public RESTfulResult insertToUploadEas(@RequestBody(required = false) Map<String,Object> map){
+        try {
+            Map<String,Object> purchaseOrder = (Map<String, Object>) map.get("purchaseOrder");
+            List<Map<String,Object>> list= (List<Map<String, Object>>) map.get("list");
+            for(Map<String,Object> item:list){
+                item.put("purchaseOrderNo",purchaseOrder.get("purchaseOrderNo"));
+                backgroundProcessingMapper.insertNotUpload(item);
+            }
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            return failed("缺乏参数！");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed("未知异常！");
+        }
+        return success("修改成功，稍后会自动上传金蝶！");
+    }
+
+    @ApiOperation(value = "重置钢材打印数量")
+    @PostMapping("resetPrintNumber")
+    public RESTfulResult resetPrintNumber(@RequestBody(required = false) Map<String,Object> map){
+        return success(backgroundProcessingMapper.resetPrintNumber(map));
+    }
 }

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

@@ -2847,4 +2847,13 @@ public class TMSController extends BaseRESTfulController {
         }
         return tmsTruckFeign.steelTransportReport(map,startTime,endTime);
     }
+
+    @ApiOperation(value = "欠运力统计报表")
+    @PostMapping("/yawnReport")
+    public Map<String,Object> yawnReport(@RequestBody(required = false)Map<String,Object>map){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return tmsTruckFeign.yawnReport(map);
+    }
 }

src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -1912,4 +1912,7 @@ public interface AmsFeign {
 
     @PostMapping("/api/v1/ams/amssaleorders/splitOrder")
     Map<String, Object> splitOrder(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/ams/amssaleorders/batchUpdateCapacity")
+    Map<String, Object> batchUpdateCapacity(@RequestBody Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/feign/TmsTruckFeign.java

@@ -839,6 +839,9 @@ public interface TmsTruckFeign {
 
     @PostMapping("/api/v1/truckTms/statisticalReport/steelTransportReport")
     Map<String, Object> steelTransportReport(@RequestBody(required = false) Map<String, Object> map, @RequestParam String startTime,@RequestParam String endTime);
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/yawnReport")
+    Map<String, Object> yawnReport(@RequestBody(required = false) Map<String, Object> map);
 }
 
 

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

@@ -67,4 +67,10 @@ public interface BackgroundProcessingMapper {
 
     //根据总实绩无差别删除多余卸货实绩，仅保留一条
     int deleteExtraUnload(BigDecimal resultTotalId);
+
+    //插入待传金蝶表格
+    int insertNotUpload(Map<String,Object> map);
+
+    //重置钢材打印数量
+    int resetPrintNumber(Map<String,Object> map);
 }

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

@@ -270,4 +270,17 @@
                 ROWS ONLY
             )
     </delete>
+    <insert id="insertNotUpload">
+        INSERT INTO AMS_NOT_UPLOADED_EAS
+        ("ORDER_ID", "NO", "RESULT_POUND_NO", "CAPACITY_NUMBER", "RESULT_CROSS_CALCULATE_NUMBER", "RESULT_TARE_CALCULATE_NUMBER", "RESULT_CROSS_WEIGHT", "RESULT_TARE_WEIGHT", "RESULT_NET_WEIGHT", "RESULT_CROSS_WEIGHT_TIME", "RESULT_TARE_WEIGHT_TIME",
+         "EAS_ENTRY_ID", "INSERT_USERNAME", "INSERT_TIME", "UPDATE_USERNAME", "UPDATE_TIME", "INSERT_UPDATE_REMARK")
+        VALUES
+        (#{orderId}, #{purchaseOrderNo}, #{poundNo}, #{capacityNo}, #{grossTruckCalculateSecond}, #{tareTruckCalculateSecond}, #{grossWeightSecond}, #{tareWeightSecond}, #{netWeightSecond}, #{grossWeigtTimeSecond}, #{tareWeightTimeSecond},
+         (SELECT EAS_ENTRY_ID FROM AMS_PURCHASE_ORDER WHERE PURCHASE_ORDER_NO=#{purchaseOrderNo} AND DELETED=0), NULL, NULL, NULL, NULL, NULL)
+    </insert>
+    <update id="resetPrintNumber">
+        UPDATE OMSTRUCK_ORDER
+        SET PRINTNUMBER=0
+        WHERE ORDER_ID = #{orderId}
+    </update>
 </mapper>