Merge remote-tracking branch 'origin/master'

op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java

@@ -90,7 +90,7 @@ public interface WmsProductPutMapper {
 
     void updateWmsProductStatus(WmsProductPut wmsProductPut2);
 
-    List<WmsProductPut> selectWmsProductPutSAPByIds(String productOrder);
+    List<WmsProductPut> selectWmsProductPutSAPByIds(@Param("id")String id);
 
 //    String selectProOrderWorkorder(WmsProductPut wmsProductPut1);
 

op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java

@@ -282,7 +282,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
                 wmsProductPut) {
             WmsProductPut wmsProductPutSAPById = wmsProductPutMapper.selectWmsProductPutSAPById(wmsProductPut1.getId());
             if (wmsProductPutSAPById != null) {
-                List<WmsProductPut> wmsProductPut2 = wmsProductPutMapper.selectWmsProductPutSAPByIds(wmsProductPutSAPById.getProductOrder());
+                List<WmsProductPut> wmsProductPut2 = wmsProductPutMapper.selectWmsProductPutSAPByIds(wmsProductPutSAPById.getId());
                 if (wmsProductPut2.size() > 0) {
                     List<Map<String, Object>> mapList = new ArrayList<>();
                     Map<String, Object> map = new HashMap<>();

op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml

@@ -472,11 +472,11 @@
 
         UPDATE wms_product_put
         SET status = '1'
-        WHERE plan_quantity = put_quantity
+        WHERE  <![CDATA[     plan_quantity <= put_quantity  	]]>
           AND status != '1'
         AND id = #{id}
     </update>
-    <select id="selectWmsProductPutSAPByIds"    >
+    <select id="selectWmsProductPutSAPByIds"    parameterType="String" resultMap="WmsProductPutResult">
         SELECT	DISTINCT
             wms_product_put.id,
             wms_product_put.work_order,

op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInMapper.xml

@@ -77,8 +77,10 @@
             <if test="poNo != null  and poNo != ''">and po_no = #{poNo}</if>
             <if test="poLine != null  and poLine != ''">and po_line = #{poLine}</if>
             <if test="poType != null  and poType != ''">and po_type = #{poType}</if>
-            <if test="materialCode != null  and materialCode != ''">and material_code = #{materialCode}</if>
-            <if test="materialDesc != null  and materialDesc != ''">and material_desc = #{materialDesc}</if>
+            <if test="materialCode != null  and materialCode != ''">and material_code like concat('%', #{materialCode},
+                '%')  </if>
+            <if test="materialDesc != null  and materialDesc != ''">and material_desc like concat('%', #{materialDesc},
+                '%') </if>
             <if test="unit != null  and unit != ''">and unit = #{unit}</if>
             <if test="buyerGroup != null  and buyerGroup != ''">and buyer_group = #{buyerGroup}</if>
             <if test="supplyCode != null  and supplyCode != ''">and supply_code = #{supplyCode}</if>
@@ -123,6 +125,7 @@
             <if test="gmtModified != null ">and gmt_modified = #{gmtModified}</if>
             <if test="activeFlag != null  and activeFlag != ''">and active_flag = #{activeFlag}</if>
         </where>
+        ORDER BY	gmt_create	DESC
     </select>
 
     <select id="selectWmsRawOrderInByRawOrderInId" parameterType="String" resultMap="WmsRawOrderInResult">