bom递归和报工调整修改

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesBomService.java

@@ -39,6 +39,15 @@ public interface IMesBomService extends IBaseMesService<MesBom> {
     @ApiOperation(value = "查询BOM树结构")
     ListPager<MesBom> queryMesDataTree(MesBom bom, Pager pager);
 
+    /**
+     * 查询MES组织模型数据返回树结构
+     *
+     * @param bom 组织代码
+     * @return 组织模型数据返回树结构
+     */
+    @ApiOperation(value = "查询BOM树结构平铺")
+    ListPager<MesBom> queryMesDataTreeAll(MesBom bom, Pager pager);
+
     @ApiOperation(value = "查询bom信息")
     List<MesBom> findMesBomByPartNoAndBomVersion(String partNo, String organizeCode, String bomVersion);
 

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

@@ -152,7 +152,8 @@ public abstract class BaseMesController<T extends BaseBean> extends BaseControll
     @ApiOperation(value = "查询信息带分页", notes = "组合查询，外带分页功能")
     public ResultBean<T> queryByPager(T bean, Pager pager) {
         try {
-            bean.setOrganizeCode(AuthUtilExt.getOrganizeCode());
+           // bean.setOrganizeCode(AuthUtilExt.getOrganizeCode());
+            bean.setOrganizeCode("ck01");
             ListPager<T> listPager = getBaseService().queryPager(bean, pager);
             return ResultBean.success("操作成功")
                     .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())

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

@@ -89,4 +89,23 @@ public class MesBomController extends BaseMesController<MesBom> {
             return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         }
     }
+
+    @GetMapping(value = "/tree/queryAll")
+    @ApiOperation(value = "查询MES组织模型数据返回树结构-获取所有")
+    public ResultBean queryMesDataTreeAll(MesBom bom, Pager pager) {
+        try {
+            ValidatorBean.checkNotNull(bom.getPartNo(), "父零件号不能为空");
+            ValidatorBean.checkNotNull(bom.getBomVersion(), "BOM版本不能为空");
+            ValidatorBean.checkNotNull(bom.getBomCode(), "BOM代码不能为空");
+            ValidatorBean.checkNotNull(bom.getEffStartTime(), "生效时间不能为空");
+            bom.setOrganizeCode(AuthUtil.getOrganizeCode());
+            //bom.setOrganizeCode("CK01");
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
+                    .setListPager(bomService.queryMesDataTreeAll(bom, pager));
+        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
 }

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

@@ -58,7 +58,8 @@ public class MesWorkOrderController extends BaseMesController<MesWorkOrder> {
     @GetMapping("/mesProductVersion/query")
     public ResultBean queryMesProdRuleByPager(MesProductVersion mesProductVersion, Pager pager){
         try {
-            String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
+           // String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
+            String organizeCode ="CK01";
             mesProductVersion.setOrganizeCode(organizeCode);
             ListPager<MesProductVersion> productVersionListPager = mesWorkOrderService.queryMesProductVersionByPager(mesProductVersion, pager);
             return ResultBean.success("生产版本查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).

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

@@ -101,6 +101,35 @@ public class MesBomService extends BaseMesService<MesBom> implements IMesBomServ
         return new ListPager<>(resultList, pager);
     }
 
+    /**
+     * 根据零件号查询所有
+     *
+     * @param bom 组织代码
+     * @return
+     */
+    @Override
+    public ListPager<MesBom> queryMesDataTreeAll(MesBom bom, Pager pager) {
+        MesBomTreeModel organize = new MesBomTreeModel();
+
+        organize.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue());
+        organize.setName(AuthUtil.getOrganize().getName());
+
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(bom.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(bom.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringEqualPack(bom.getBomVersion(), "bomVersion", packBean);
+        DdlPreparedPack.getStringEqualPack(bom.getBomCode(), "bomCode", packBean);
+        DdlPreparedPack.getStringSmallerPack(bom.getEffStartTime(), "effStartTime", packBean);
+        packBean.setOrderByStr(" order by createDatetime desc ");
+        pager = PagerHelper.getPager(pager, baseRDao.findByHqlWhereCount(packBean));
+
+        List<MesBom> bomList = baseRDao.findByHqlWherePage(packBean, pager);
+
+        List<MesBom> list = recursionBomListAll(bomList,bom.getEffStartTime(), null);;
+
+
+        return new ListPager<>(list, pager);
+    }
+
     public List<MesBom> findMesBomByPartNoAndBomVersion(String partNo, String organizeCode, String bomVersion, String bomCode, String effStartTime) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
         DdlPreparedPack.getStringEqualPack(partNo, "partNo", ddlPackBean);
@@ -216,6 +245,29 @@ public class MesBomService extends BaseMesService<MesBom> implements IMesBomServ
         return bomList;
 
     }
+    /**
+     * 递归查询bom
+     *
+     * @return
+     */
 
+    private List<MesBom> recursionBomListAll(List<MesBom> bomList,String effStartTime,List<MesBom> allList) {
+        if (CollectionUtils.isEmpty(allList)) {
+            allList = new ArrayList<>();
+            allList.addAll(bomList);
+        }
+
+        if (!CollectionUtils.isEmpty(bomList)) {
+            for (MesBom bom : bomList) {
+                if (Objects.equals("X", bom.getPartType())) {
+                    List<MesBom> resultList = findMesBomByPartNoAndBomVersion(bom.getItemPartNo(), bom.getOrganizeCode(), bom.getBomVersion(), bom.getBomCode(), effStartTime);
+                    allList.addAll(resultList);
+                    recursionBomListAll(resultList,effStartTime, allList);
+                }
+            }
+        }
+        return allList;
+
+    }
 
 }

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

@@ -1089,7 +1089,6 @@ public class MesProductionRecordServiceImpl extends BaseMesService<MesProduction
                 if (Objects.equal(recordLog.getCategoryLevelTwo(),"shot_counter") && recordLog.getEquipVariableValue().compareTo("0") > 0) {
                     startTime = recordLog.getCreateDatetime();
 
-                    endTime = recordLog.getCreateDatetime();
                     if (Objects.equal(recordLog.getQuality(), "192")) {
                         reason += String.format(reasonOffline,startTime, 1 +"");
                     } else {

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

@@ -70,7 +70,9 @@ public class MesWorkOrderLogService extends BaseMesService<MesWorkOrderLog> impl
                 " wol.wo_source as workOrderSource," +
                 " wol.adjust_qty as adjustQty,"+
                 " wol.modify_qty as modifyQty,"+
-                " wol.remark as remark ";
+                " wol.remark as remark," +
+                " wol.description as description "
+                ;
 
         String sql = " from mes_work_order_log wol" +
                 " where 1=1  " +

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

@@ -845,6 +845,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
     @Override
     public void doProductReport(MesWorkOrder mesWorkOrder) {
         MesWorkOrder mesWorkOrderDb = baseRDao.getById(mesWorkOrder.getId());
+        mesWorkOrderDb.setDescription(mesWorkOrder.getDescription());
         if (Objects.isNull(mesWorkOrderDb)) {
             MesException.throwMesBusiException("工单id为【%s】工单信息不存在", mesWorkOrder.getId());
         }