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

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

@@ -94,6 +94,20 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         return input;
     }
 
+    @ApiModelProperty(value = "查询车牌号分录根据数组")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "saleNumber", value = "WXSDD-20210909-00000007", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "saleAccountBalance", value = "3000", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "saleCurrentOrderAmount", value = "1000", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "saleHistoricalOrderAmount", value = "5000", required = true, dataType = "String"),
+    })
+    @PostMapping("/findCarNumberByOrderList")
+    public Map<String,Object> findCarNumberByOrderList(@RequestBody List<Map<String,Object>> mapList) {
+        Map<String,Object> input = amsSaleOrderService.findCarNumberByOrderList(mapList);
+        return input;
+    }
+
+
 
 
 

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

@@ -170,7 +170,7 @@ public class WSFaceController extends BaseRESTfulController {
         WSFaceFacadeSrvProxyServiceLocator locator = new WSFaceFacadeSrvProxyServiceLocator();
         service.setServername("172.16.33.111" , "8888");
         //WSContext wsContext = LoginUtil.doEASLogin(service);
-        //测试服务器
+        ////测试服务器
         //DeleteServiceInfo service = new DeleteServiceInfo("user", "dgjt@kingdee", "eas", "A004", "L2", 0);
         //DeleteWSFaceFacadeSrvProxyServiceLocator locator = new DeleteWSFaceFacadeSrvProxyServiceLocator();
         ////测试服务器

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

@@ -20,4 +20,7 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     Map<String,Object> findCarNumberByOrderId(BigDecimal saleOrderMaterialId);
 
     List<Map<String, Object>> findEntriesByOrderId(BigDecimal saleOrderMaterialId);
+
+    List<Map<String, Object>> finCarAndCarrierAndEntries(BigDecimal saleOrderMaterialId);
+
 }

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

@@ -38,6 +38,8 @@ public interface IAmsSaleOrderService {
 
     Map<String,Object> findCarNumberByOrderId(BigDecimal saleOrderMaterialId);
 
+    Map<String, Object> findCarNumberByOrderList(List<Map<String, Object>> mapList);
+
     //新增内转钢材到异地库接收接口
     int addInwardSteelOrder(Map<String,Object> map) throws Exception;
 

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

@@ -17,10 +17,7 @@ import javax.xml.crypto.Data;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * AmsSaleOrder服务实现：
@@ -449,6 +446,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             head.replace("forwarder","自提");
         }
         List<Map<String,Object>> entries = omstruckOrderMapper.findEntriesByOrderId(saleOrderMaterialId);
+        //遍历数组 en
         Map<String,Object> input = new HashMap<>();
         input.put("entries",entries);
         input.put("head",head);
@@ -456,6 +454,22 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     }
 
 
+    @Override
+    public Map<String, Object> findCarNumberByOrderList(List<Map<String, Object>> mapList) {
+        List<Map<String,Object>> entries = new ArrayList<>();
+        //遍历车序号数组,获取车序号ID
+        for(Map<String,Object> map : mapList){
+            BigDecimal saleOrderMaterialId = new BigDecimal((Integer) map.get("saleOrderMaterialId")) ;
+            //根据车序号ID去查询车牌号、承运商以及分录ID
+            List<Map<String,Object>> head = omstruckOrderMapper.finCarAndCarrierAndEntries(saleOrderMaterialId);
+            entries.addAll(head);
+        }
+        Map<String,Object> input = new HashMap<>();
+        input.put("entries",entries);
+        return input;
+    }
+
+
 
 
     //添加内转钢材到异地库
@@ -828,4 +842,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
        result = omstrainOrderMapper.updateByPrimaryKeySelective(omstrainOrder);
         return result;
     }
+
+
+
+
 }

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

@@ -457,6 +457,8 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
                 //如果取出来的皮重 大于 传进来的皮重   则需要调换路段顺序号
                 tmstruckWeightResult.setGrossSegmentSqe(DataChange.dataToBigDecimal(twoMap.get("tareSegmentSqe")));
                 tmstruckWeightResult.setTareSegmentSqe(new BigDecimal(sqe));
+            }else{
+                tmstruckWeightResult.setGrossSegmentSqe(new BigDecimal(sqe));
             }
             try {
                 addWeightResult(tmstruckWeightResult, map);

src/main/resources/application-dev.yml

@@ -10,11 +10,11 @@ spring:
 
 openfeign:
   OmsFeign:
-    url: ${OMSFEIGN_URL:172.16.33.166:8016}
+    url: ${OMSFEIGN_URL:localhost:8016}
   imFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8008}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
   BmsTruckFeign:
     url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8009}
 server:

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

@@ -831,4 +831,24 @@
                            ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
         WHERE ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
     </select>
+    <select id="finCarAndCarrierAndEntries" resultType="java.util.Map" parameterType="decimal">
+        SELECT DISTINCT RC.CAPACITY_NUMBER AS "carNum",
+                        RCE.CARRIER_ABBREVIATION AS "forwarder",
+                        ASM.EAS_PRIMARY_ID AS "entryId"
+        FROM AMS_SALE_ORDER_MATERIAL ASOM
+        LEFT JOIN OMSTRUCK_ORDER OO
+        ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+        ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN AMS_SALE_MATERIAL ASM
+        ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+        LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
+        ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN RMS_CARRIER RCE
+        ON RCE.CARRIER_ID = ADSO.CARRIER_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        WHERE ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
+          AND OO.ORDER_TYPE = 1
+    </select>
 </mapper>