txf 3 years ago
parent
commit
221cb68201

+ 0 - 2
src/main/java/com/steerinfo/dil/service/impl/TmstruckMeasureCommissionServiceImpl.java

@@ -267,8 +267,6 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("IsAssembly", false);
                 measureCommission.put("IsAssembly", false);
                 measureCommission.put("deliveryMethod", "磅重交货");
                 measureCommission.put("deliveryMethod", "磅重交货");
                 measureCommission.put("packagesNum", 0);
                 measureCommission.put("packagesNum", 0);
-                measureCommission.put("ReceivUnit","四川省达州钢铁集团有限责任公司");
-                measureCommission.put("sendUnit","四川省达州钢铁集团有限责任公司");
                 break;
                 break;
             case 12:
             case 12:
             case 13:
             case 13:

+ 4 - 1
src/main/resources/com/steerinfo/dil/mapper/TmstruckMeasureCommissionMapper.xml

@@ -1151,13 +1151,16 @@
               CONCAT(RM.MATERIAL_SPECIFICATION, RM.MATERIAL_MODEL) "goodsType",
               CONCAT(RM.MATERIAL_SPECIFICATION, RM.MATERIAL_MODEL) "goodsType",
               OO.INSERT_UPDATE_REMARK   "demo",
               OO.INSERT_UPDATE_REMARK   "demo",
               RM.MATERIAL_ID          "materialId",
               RM.MATERIAL_ID          "materialId",
-              RW.WAREHOUSE_NAME       "unloadPlace"
+              RW.WAREHOUSE_NAME       "unloadPlace",
+              RW.WAREHOUSE_NAME       "ReceivUnit",
+              RW2.WAREHOUSE_NAME      "sendUnit"
        from OMSTRUCK_ORDER OO
        from OMSTRUCK_ORDER OO
         left join AMSTRUCK_INWARD_PLAN  AIP on OO.ORDER_PLAN_ID = AIP.PLAN_ID
         left join AMSTRUCK_INWARD_PLAN  AIP on OO.ORDER_PLAN_ID = AIP.PLAN_ID
         left join AMSTRUCK_REQUIREMENT_PLAN ARP on ARP.PLAN_ID = AIP.PLAN_ID
         left join AMSTRUCK_REQUIREMENT_PLAN ARP on ARP.PLAN_ID = AIP.PLAN_ID
         left join AMSTRUCK_INWARD_REQUIREMENT AIR ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
         left join AMSTRUCK_INWARD_REQUIREMENT AIR ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
         LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
         LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
         LEFT JOIN RMS_WAREHOUSE RW on RW.WAREHOUSE_ID = ARM.REQUIREMENT_UNLOAD_UNIT_ID
         LEFT JOIN RMS_WAREHOUSE RW on RW.WAREHOUSE_ID = ARM.REQUIREMENT_UNLOAD_UNIT_ID
+        left join RMS_WAREHOUSE RW2 on RW2.WAREHOUSE_ID = ARM.REQUIREMENT_PLATFORM_ID
         left join OMSTRUCK_ORDER_MATERIAL OOM  on OO.ORDER_ID = OOM.ORDER_ID
         left join OMSTRUCK_ORDER_MATERIAL OOM  on OO.ORDER_ID = OOM.ORDER_ID
         left join RMS_MATERIAL  RM on OOM.MATERIAL_ID = RM.MATERIAL_ID
         left join RMS_MATERIAL  RM on OOM.MATERIAL_ID = RM.MATERIAL_ID
         left join RMS_CAPACITY  RC on OO.CAPACITY_ID = RC.CAPACITY_ID
         left join RMS_CAPACITY  RC on OO.CAPACITY_ID = RC.CAPACITY_ID