Merge branch 'liweidong'

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

@@ -26,6 +26,7 @@
         <if test = "entity.status != null and entity.status != ''">
             AND status = #{entity.status}
         </if>
+        ORDER BY RELEASE_DATE DESC
     </select>
     <select id="getMaxPriority" resultType="java.lang.Long">
         select nvl(max(a.priority),1) as vPriority

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpPartoplinkFirseqMapper.xml

@@ -5,5 +5,6 @@
         select a.prtno as partcode, a.prtname as partname, a.firpp, a.firppname, a.firseq, a.firseqname, a.firseqno
         from dba_mgr.v_partoplink_firseq a
         where prtno = #{partCode}
+        order by a.firseqno
     </select>
 </mapper>

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java

@@ -164,6 +164,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			yieldPlan.setProductIdent(mesRbWo.getPrtlotno());
 			yieldPlan.setYpQty(Long.valueOf(Math.round(Double.parseDouble(mesRbWo.getWoporqty()))));
 			//直接取erp数据不查询mes
+			log.info("qyl:同步生产计划零件信息:{}:{}:{}",mesRbWo.getPrtarea(),mesRbWo.getPrtdesc(),mesRbWo.getProcesslinedesc());
 			yieldPlan.setYpArea(mesRbWo.getPrtarea());
 			yieldPlan.setPartName(mesRbWo.getPrtdesc());
 			yieldPlan.setPrimaryCraft(mesRbWo.getProcesslinedesc());