添加焦炭备注

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

@@ -1953,10 +1953,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 break;
             case 19:
                  mesMap=omstruckOrderMapper.getSporadicOrder(map);
-                 if (orderType==19) {
-                     type += "零星退货";
-                     mesMap.put("type", type);
-                 }
+                 type += "零星退货";
+                 mesMap.put("type", type);
 
 
         }

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

@@ -2898,13 +2898,15 @@
                ASOM.SALE_DATE_OF_RECEIPT            "saleDateOfReceipt",
                RC2.CONSIGNEE_COMPANY_NAME           "consigneeCompanyName",
                CONCAT(CONCAT(CONCAT(RDA.ADDRESS_PROVINCE, RDA.ADDRESS_DISTRICT), RDA.ADDRESS_TOWN),
-                      RDA.ADDRESS_DELIVERY_ADDRESS) "receiveAddressName"
-
+               RDA.ADDRESS_DELIVERY_ADDRESS) "receiveAddressName",
+               ASM.SALE_WAREHOUSE                   "remark"
         FROM OMSTRUCK_ORDER OO
                  LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
                            on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
                  LEFT JOIN AMS_SALE_ORDER ASO
                            ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+                 LEFT JOIN AMS_SALE_MATERIAL ASM
+                           ON ASM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
                  LEFT JOIN RMS_SHIPPER RS
                            ON RS.SHIPPER_ID = ASO.SHIPPER_ID
                  LEFT JOIN RMS_CONSIGNEE RC2