Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS into dev

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

@@ -152,13 +152,20 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         Object materialId = map.get("materialId");
         BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderType"));
         //预计进厂时间
-        Date orderEntryTime = new Date((long) map.get("orderEntryTime"));
+        Date orderEntryTime = null;
+        if(map.get("orderEntryTime") != null){
+            try {
+                orderEntryTime = new Date((long) map.get("orderEntryTime"));
+            } catch (Exception e) {
+                System.out.println("预估进厂日期转换失败");
+            }
+        }
         int count = 0;
         for (Map<String, Object> capacityMap : driverCapacityIdList) {
             //添加运输订单
             OmstruckOrder omstruckOrder = generateOmsTruckOrder(map);
             omstruckOrder.setOrderPlanId(purchaseOrderId);
-            omstruckOrder.setCapacityId(DataChange.dataToBigDecimal(capacityMap.get("capacityId"))); //添加运力排班ID
+            omstruckOrder.setCapacityId(DataChange.dataToBigDecimal(capacityMap.get("capacityId"))); //添加运力ID
             omstruckOrder.setOrderEntryTime(orderEntryTime);
             count += omstruckOrderMapper.insertSelective(omstruckOrder);
             BigDecimal orderId = omstruckOrder.getOrderId();

src/main/resources/application-dev.yml

@@ -13,7 +13,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
   AmsFeign:
     url: ${AMSFEIGN_URL:172.16.33.162:8015}
   ImFeign:

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

@@ -1612,8 +1612,10 @@
         join DIL_BATCH DB on apo.BATCH_ID = db.BATCH_ID
         where db.MATERIAL_ID = #{materialId}
         and apo.SUPPLIER_UNIT_ID = #{supplierId}
-        and apo.purchasing_organization_id = #{purchaseOrgId}
         and apo.deleted = 0
+        <if test="purchaseOrgId != null">
+            and apo.purchasing_organization_id = #{purchaseOrgId}
+        </if>
         <if test="remark != null">
             and instr(db.RESULT_FOREIGN_SHIP_NAME, #{remark}) > 0
         </if>
@@ -2821,7 +2823,12 @@
                RS.SUPPLIER_NAME   "shipperName",
                RCON.CONSIGNEE_COMPANY_NAME  "consigneeCompanyName",
                RW.WAREHOUSE_NAME  "unloadName",
-               OO.ORDER_TYPE      "orderType"
+               OO.ORDER_TYPE      "orderType",
+               (case when APO.PURCHASING_ORGANIZATION_ID = 1
+                     then '一厂'
+                     when APO.PURCHASING_ORGANIZATION_ID = 2
+                     then '二厂'
+               end) "organizationCode"
         FROM OMSTRUCK_ORDER OO
                  LEFT JOIN RMS_CAPACITY RC
                            ON RC.CAPACITY_ID = OO.CAPACITY_ID