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

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

@@ -69,7 +69,7 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         BigDecimal capacityTypeId=DataChange.dataToBigDecimal(mapValue.get("capacityTypeId"));
         String InsertUpdateRemark = (String) mapValue.get("remark");
         String isMineral    = (String)mapValue.get("isMineral");
-//        取出装机需求
+       //取出装机需求
         String loadingRemark = (String) mapValue.get("installremark");
         Long dueTime =(Long) mapValue.get("DueTime");
 

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

@@ -524,12 +524,12 @@
       apo.DELETED = 0
       <if test="con != null" >
         and instr(apo.PURCHASE_ORDER_NO, #{con}) > 0 or instr(rsu.SUPPLIER_NAME, #{con}) > 0
+        or instr(rsb.SHIPPER_NAME, #{con}) > 0  or instr(rm.MATERIAL_NAME, #{con}) > 0
+        or instr(db.RESULT_FOREIGN_SHIP_NAME, #{con}) > 0
       </if>
       <if test="sendCompId != null and con == null">
         and apo.SUPPLIER_UNIT_ID = #{sendCompId}
       </if>
-
-
     )
     <where>
       <if test="purchaseOrderNo!= null">