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

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/SapProductPlanController.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.ISapProductPlanService;
+import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt;
 import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
@@ -34,6 +35,7 @@ public class SapProductPlanController extends BaseMesController<SapProductPlan>
     @ApiOperation(value = "分页查询SAP生产计划", notes = "分页查询SAP生产计划")
     public ResultBean querySapProductPlanByPager(SapProductPlan sapProductPlan, Pager pager) {
         try {
+            sapProductPlan.setOrganizeCode(AuthUtilExt.getOrganizeCode());
             ListPager<SapProductPlan> listPager = iSapProductPlanService.querySapProductPlanPager(sapProductPlan, pager);
             return ResultBean.success("查询成功")
                     .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/SapProductPlanDaoImpl.java

@@ -37,7 +37,7 @@ public class SapProductPlanDaoImpl implements ISapProductPlanDao {
                 "mes.complete_qty,sap.gsmng-mes.complete_qty as unFinishQty,sap.meins,sap.psttr,sap.pedtr,sap.l_str," +
                 "sap.plwrk,mes.create_date_time,mes.create_user,mes.modify_date_time,mes.modify_user");
         StringBuilder hql = new StringBuilder();
-        hql.append(" from sap_product_plan sap left join mes_work_order mes on sap.plnum = mes.plnum and sap.plmat = mes.part_no " +
+        hql.append(" from sap_product_plan sap left join mes_work_order mes on sap.plnum = mes.plan_order_no and sap.plmat = mes.part_no " +
                 "where sap.is_deleted=:isDeleted and sap.is_valid=:isValid and sap.organize_code=:organizeCode " +
                 " and mes.is_deleted=:isDeleted and mes.is_valid=:isValid and mes.organize_code=:organizeCode");
         //拼接查询条件
@@ -46,7 +46,7 @@ public class SapProductPlanDaoImpl implements ISapProductPlanDao {
                 "mes.complete_qty,mes.qty-mes.complete_qty as unFinishQty,sap.meins,sap.psttr,sap.pedtr,sap.l_str," +
                 "sap.plwrk,mes.create_date_time,mes.create_user,mes.modify_date_time,mes.modify_user");
         StringBuilder unionHql = new StringBuilder();
-        unionHql.append(" from sap_product_plan sap right join mes_work_order mes on sap.plnum = mes.plnum and sap.plmat = mes.part_no " +
+        unionHql.append(" from sap_product_plan sap right join mes_work_order mes on sap.plnum = mes.plan_order_no and sap.plmat = mes.part_no " +
                 "where mes.is_deleted=:isDeleted and mes.is_valid=:isValid and mes.organize_code=:organizeCode and sap.id is null ");
         //拼接查询条件
         packWhere(sapProductPlan, unionHql);