修改

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

@@ -791,7 +791,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             String materialName =(String) map1.get("materialName");
             if (materialName.contains("盘螺")){
                 map1.put("materialType","盘螺");
-            }else if (materialName.contains("盘圆")){
+            }else if (materialName.contains("盘圆")||materialName.contains("盘元")){
                 map1.put("materialType","盘圆");
             }else if (materialName.contains("螺纹")){
                 map1.put("materialType","螺纹钢");

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

@@ -958,12 +958,12 @@
   </select>
 
    <!-- 对外开发查询接口-->
-    <select id="selectSaleSteelOrder" resultType="java.util.Map" parameterType="java.lang.String">
+    <select id="selectSaleSteelOrder" resultType="java.util.Map" parameterType="java.util.Map">
       SELECT DISTINCT
         OO2.ORDER_NO "orderNumber",
         OO.ORDER_ID "orderId",
         OO.ORDER_ISSUE_TIME "orderIssueTime",
-        DECODE( RS.SHIPPER_NAME, '四川省达州钢铁集团有限责任公司', '四川省达州市通川区' ) AS "shipperAdddress",
+        DECODE( RS.SHIPPER_NAME, '四川省达州钢铁集团有限责任公司', '四川省达州市通川区' ) AS "shipperAddress",
         RS.SHIPPER_NAME "shipperName",
         RC.CONSIGNEE_COMPANY_NAME "companyName",
         CONCAT( CONCAT( CONCAT( RRA.ADDRESS_PROVINCE, ADDRESS_DISTRICT ), ADDRESS_TOWN ), RRP.ADDRESS_DELIVERY_ADDRESS ) "consigneeAddress",
@@ -978,7 +978,8 @@
         CONCAT(ASM.MATERIAL_NUMBER,'件') "materialNum",
         CONCAT(TWR.RESULT_NET_WEIGHT,'吨') "netWeight",
         ASO.SALE_REMARK "remark",
-        DECODE(ASM.IS_POUND_SALE,'0','磅重','1','理重') "isPoundSale",
+--         DECODE(ASM.IS_POUND_SALE,'0','磅重','1','理重') "isPoundSale",
+        ASM.IS_POUND_SALE "isPoundSale",
         WOR.RESULT_ID "resultId"
       FROM
         OMSTRAIN_ORDER OO2 --销售订单
@@ -1007,7 +1008,6 @@
           LEFT JOIN WMSP_OUTBOUND_RESULT WOR  ON WOR.BILL_LADING_ID = OO.ORDER_ID
           LEFT JOIN TMSTRUCK_ARRIVAL_RESULT TAR ON TAR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
           LEFT JOIN TMStRUCK_RECEIPT_RESULT TRR ON TTR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
-
       WHERE
         ASO.SALE_TYPE IN (4)
        AND OO2.ORDER_WAGON_NO = #{wagonNo}