asd

src/main/java/com/steerinfo/dil/controller/OmstruckOrderController.java

@@ -962,9 +962,6 @@ public class OmstruckOrderController extends BaseRESTfulController {
     //通过物资id查询批次表匹配最新的批次，关联最新的采购订单号
     @PostMapping("/selectNewOrderId")
     public RESTfulResult selectNewOrderId(@RequestBody(required = false) Map<String, Object> map) {
-        if(map.get("remark") != null){
-            map.put("remark", "%" + map.get("remark") +"%");
-        }
         return success(omstruckOrderService.selectNewOrderId(map));
     }
 

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/oms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

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

@@ -529,7 +529,7 @@
         </set>
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </update>
-    <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
         <include refid="select" />
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </select>
@@ -1611,8 +1611,9 @@
         join DIL_BATCH DB on apo.BATCH_ID = db.BATCH_ID
         where db.MATERIAL_ID = #{materialId}
         and apo.SUPPLIER_UNIT_ID = #{supplierId}
+        and apo.deleted = 0
         <if test="remark != null">
-            and db.RESULT_FOREIGN_SHIP_NAME like #{remark}
+            and instr(db.RESULT_FOREIGN_SHIP_NAME, #{remark}) > 0
         </if>
         order by apo.PURCHASE_ORDER_NO desc
         )
@@ -1728,6 +1729,7 @@
         RC.CAPACITY_NUMBER "capacityNumber",
         RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
         RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN "addressDeliveryAddress",
+        ACTP.PRICE_VALUE "priceValue",
         ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
         OO.ORDER_RECEIVE_REFUSE_TIME "orderReceiveRefuseTime",
         RS.SHIPPER_NAME "shipperName",
@@ -1745,6 +1747,8 @@
         ON RS.SHIPPER_ID=ASO.SHIPPER_ID
         LEFT JOIN RMS_RECEIVE_ADDRESS RRA
         ON RRA.ADDRESS_ID=ASOM.SALE_SHIPPING_ADDRESS_ID
+        LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE ACTP
+        ON OO.PRICE_ID=ACTP.PRICE_ID
         <where>
             <if test="orderStatus!=null">
                 AND OO.ORDER_STATUS = #{orderStatus}