Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java

@@ -167,8 +167,8 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
             }
         }else{
             DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
-            DdlPreparedPack.getStringEqualPack(bean.getPlanOrderNo(),"orderNo",ddlPackBean);
-            DdlPreparedPack.getStringEqualPack(bean.getPartNo(),"partNo",ddlPackBean);
+            DdlPreparedPack.getStringEqualPack(bean.getPlanOrderNo(),"planOrderNo",ddlPackBean);
+            DdlPreparedPack.getStringEqualPack(bean.getPartNo(),"planPartNo",ddlPackBean);
             MesProductPlan mesProductPlan = mesProductPlanRDao.getByProperty(ddlPackBean);
             if(null == mesProductPlan){
                 MesException.throwMesBusiException("SAP计划单号【%s】物料【%s】,不存在", bean.getPlanOrderNo(), bean.getPartNo());