Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr into liweidong

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java

@@ -240,8 +240,8 @@ public interface IErpDataProduceClient {
     R<String> returnOemErpByWxno(@RequestParam(value = "hrCode") String wxNo);
 
     @GetMapping(SELECT_MAX_WOTOTQTY_BY_WONO)
-    R<Double> selectMaxWototqtyByWono(String code);
+    R<Double> selectMaxWototqtyByWono(@RequestParam(value = "code") String code);
 
     @GetMapping(SELECT_MAX_WOCLSTOTQTY_BY_WONO)
-    R<Double> selectMaxWoclstotqtyByWono(String code);
+    R<Double> selectMaxWoclstotqtyByWono(@RequestParam(value = "code") String code);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.xml

@@ -95,7 +95,7 @@
         </where>
     </select>
     <select id="selectNeedSyncPoCodes" resultType="java.lang.String">
-        SELECT po_code
+        SELECT yp_code
         FROM (SELECT *
         FROM MES_YIELD_PLAN
         WHERE status &lt; 10015
@@ -116,7 +116,7 @@
         UPDATE MES_YIELD_PLAN SET DELIVERY_QTY = #{woTotqty}, CHECK_TOTQTY_TIME = SYSDATE WHERE YP_CODE = #{code}
     </update>
     <update id="updateWithWocls">
-        UPDATE MES_YIELD_PLAN SET DELIVERY_QTY = #{woTotqty}, CHECK_TOTQTY_TIME = SYSDATE, STATUS = 10015, CHECK_CLOSE_TIME = SYSDATE WHERE YP_CODE = #{code}
+        UPDATE MES_YIELD_PLAN SET DELIVERY_QTY = #{woclsTotqty}, CHECK_TOTQTY_TIME = SYSDATE, STATUS = 10015, CHECK_CLOSE_TIME = SYSDATE WHERE YP_CODE = #{code}
     </update>
     <update id="updateOnlyCheckTime">
         UPDATE MES_YIELD_PLAN SET CHECK_TOTQTY_TIME = SYSDATE WHERE YP_CODE = #{code}