Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev

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

@@ -35,7 +35,7 @@ public class SapProductPlanDaoImpl implements ISapProductPlanDao {
     public ListPager<SapProductPlan> querySapProductPlanPager(SapProductPlan sapProductPlan, Pager pager) {
         //查询数据
         StringBuffer dataHql = new StringBuffer("select sap.plnum,sap.plmat,ifnull(sap.gsmng,0) as sumQty," +
-                "ifnull(mes.complete_qty,0) as completeQty,sap.meins,sap.psttr,sap.pedtr,sap.l_str," +
+                "ifnull(mes.reported_qty,0) as completeQty,sap.meins,sap.psttr,sap.pedtr,sap.l_str," +
                 "sap.plwrk,sap.create_date_time,sap.create_user,sap.modify_date_time,sap.modify_user");
         StringBuilder hql = new StringBuilder();
         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 " +
@@ -44,7 +44,7 @@ public class SapProductPlanDaoImpl implements ISapProductPlanDao {
         //拼接查询条件
         packWhere(sapProductPlan, hql);
         StringBuffer unionDataHql = new StringBuffer("select sap.plnum,mes.part_no,ifnull(mes.qty,0) as sumQty," +
-                "ifnull(mes.complete_qty,0) as completeQty,part.unit,sap.psttr,sap.pedtr,sap.l_str," +
+                "ifnull(mes.reported_qty,0) as completeQty,part.unit,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.plan_order_no and sap.plmat = mes.part_no " +

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

@@ -320,8 +320,8 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
             ValidatorBean.checkNotNull(item.getPlanStartTime(), "计划开始时间不能为空");
             ValidatorBean.checkNotNull(item.getPlanEndTime(), "计划结束时间不能为空");
             //拼接
-            item.setPlanStartTime(item.getPlanStartTime() + " " + "00:00:00");
-            item.setPlanEndTime(item.getPlanEndTime() + " " + "23:59:59");
+//            item.setPlanStartTime(item.getPlanStartTime() + " " + "00:00:00");
+//            item.setPlanEndTime(item.getPlanEndTime() + " " + "23:59:59");
         }
         //物料名称不存在，从物料信息中获取
         if (StringUtil.isEmpty(item.getPartNameRdd())) {

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java

@@ -357,4 +357,16 @@ public class MesSpotCheckOrderService extends BaseMesService<MesSpotCheckOrder>
         }
     }
 
+
+    protected void setPackQueryBean(MesSpotCheckOrder bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringLikerPack(bean.getSpotCheckOrderNo(),"spotCheckOrderNo",packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getWorkCenterCode(),"workCenterCode",packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getWorkCellCode(),"workCellCode",packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getSpotCheckCode(),"spotCheckCode",packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getSpotCheckName(),"spotCheckName",packBean);
+        DdlPreparedPack.getNumEqualPack(bean.getStatus(),"status",packBean);
+        DdlPreparedPack.getNumEqualPack(bean.getSpotCheckOrderResult(),"spotCheckOrderResult",packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getEquipName(),"equipName",packBean);
+    }
+
 }