嘉兴 pcn 工单接口调整

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

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.ext.mes.pcn.api.base;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.model.SxWorkCellModel;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.mes.bean.MesArea;
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell;
 import io.swagger.annotations.ApiOperation;
 
@@ -32,4 +33,12 @@ public interface ISxOrganizeExtService {
      */
     @ApiOperation(value = "工程不良分类统计月报日报", notes = "工程不良分类统计月报日报")
     ListPager<SxWorkCellModel> queryValidWorkCellListPage(SxWorkCellModel workCellModel, Pager pager);
+
+    /**
+     * 查询区域集合
+     * @param organizeCode
+     * @return
+     */
+    @ApiOperation(value = "查询区域集合", notes = "查询区域集合")
+    List<MesArea> queryAreaList(String organizeCode);
 }

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

@@ -47,4 +47,17 @@ public class SxOrganizeExtController extends MesPcnBaseController {
         }
     }
 
+    @GetMapping(value = "/area-ext/query-list")
+    @ApiOperation(value = "查询区域集合")
+    public ResultBean queryAreaList(String organizeCode) {
+        try {
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
+                    .setResultList(organizeService.queryAreaList(organizeCode));
+        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
 }

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

@@ -11,13 +11,16 @@ import cn.estsh.i3plus.pojo.base.common.PagerHelper;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.MesArea;
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell;
+import cn.estsh.i3plus.pojo.mes.repository.MesAreaRepository;
 import cn.estsh.i3plus.pojo.mes.repository.MesWorkCellRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,6 +35,9 @@ import java.util.List;
 public class SxOrganizeExtService implements ISxOrganizeExtService {
 
     @Autowired
+    private MesAreaRepository areaRepository;
+
+    @Autowired
     private MesWorkCellRepository workCellRepository;
 
     @Override
@@ -64,4 +70,12 @@ public class SxOrganizeExtService implements ISxOrganizeExtService {
         }
         return new ListPager<>(resultList, pager);
     }
+
+    @Override
+    public List<MesArea> queryAreaList(String organizeCode) {
+        if (StringUtils.isEmpty(organizeCode)) return null;
+        return areaRepository.findByProperty(
+                new String[]{MesPcnExtConstWords.ORGANIZE_CODE, MesPcnExtConstWords.IS_DELETED, MesPcnExtConstWords.IS_VALID},
+                new Object[]{organizeCode, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue()});
+    }
 }

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

@@ -443,23 +443,25 @@ public class SxWorkOrderExtService implements ISxWorkOrderExtService {
     public ListPager<WorkOrderPageVo> getListPageByCondition(WorkOrderQueryDto workOrderQueryDto, Pager pager) {
         String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
-        DdlPreparedPack.getStringLikerPack(workOrderQueryDto.getOrderNo(), "orderNo", ddlPackBean);
-        DdlPreparedPack.getStringLikerPack(workOrderQueryDto.getPartNo(), "partNo", ddlPackBean);
-        DdlPreparedPack.getStringEqualPack(workOrderQueryDto.getWorkCenterCode(), "workCenterCode", ddlPackBean);
-        DdlPreparedPack.getNumEqualPack(workOrderQueryDto.getWorkOrderStatus(), "workOrderStatus", ddlPackBean);
-        DdlPreparedPack.getNumEqualPack(workOrderQueryDto.getSnCreateStatus(), "snCreateStatus", ddlPackBean);
-        DdlPreparedPack.getInPackArray(workOrderQueryDto.getWorkOrderStatusArray(), "workOrderStatus", ddlPackBean);
-        DdlPreparedPack.getNumEqualPack(workOrderQueryDto.getWorkOrderType(), "workOrderType", ddlPackBean);
-        DdlPreparedPack.getStringLikerPack(workOrderQueryDto.getCreateUser(), "createUser", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(workOrderQueryDto.getOrderNo(), MesPcnExtConstWords.ORDER_NO, ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(workOrderQueryDto.getPartNo(), MesPcnExtConstWords.PART_NO, ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(workOrderQueryDto.getAreaCode(), MesPcnExtConstWords.AREA_CODE, ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(workOrderQueryDto.getWorkCenterCode(), MesPcnExtConstWords.WORK_CENTER_CODE, ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(workOrderQueryDto.getSnCreateStatus(), MesPcnExtConstWords.SN_CREATE_STATUS, ddlPackBean);
+        if (!StringUtils.isEmpty(workOrderQueryDto.getWorkOrderStatus()) || null != workOrderQueryDto.getWorkOrderStatusArray()) {
+            DdlPreparedPack.getNumEqualPack(workOrderQueryDto.getWorkOrderStatus(), MesPcnExtConstWords.WORK_ORDER_STATUS, ddlPackBean);
+            DdlPreparedPack.getInPackArray(workOrderQueryDto.getWorkOrderStatusArray(), MesPcnExtConstWords.WORK_ORDER_STATUS, ddlPackBean);
+        } else if (StringUtils.isEmpty(workOrderQueryDto.getIsHasDel()) || !workOrderQueryDto.getIsHasDel().equals(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValueStr()))
+            DdlPreparedPack.getNumNOEqualPack(MesPcnExtEnumUtil.WORK_ORDER_STATUS.REMOVE.getValue(), MesPcnExtConstWords.WORK_ORDER_STATUS, ddlPackBean);
+
+        DdlPreparedPack.getNumEqualPack(workOrderQueryDto.getWorkOrderType(), MesPcnExtConstWords.WORK_ORDER_TYPE, ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(workOrderQueryDto.getCreateUser(), MesPcnExtConstWords.CREATE_USER, ddlPackBean);
 
         if (!StringUtils.isEmpty(workOrderQueryDto.getStartTimeStart()) || !StringUtils.isEmpty(workOrderQueryDto.getStartTimeEnd())) {
-            DdlPreparedPack.timeBuilder(workOrderQueryDto.getStartTimeStart(), workOrderQueryDto.getStartTimeEnd(), "startTime", ddlPackBean, true);
+            DdlPreparedPack.timeBuilder(workOrderQueryDto.getStartTimeStart(), workOrderQueryDto.getStartTimeEnd(), MesPcnExtConstWords.START_TIME, ddlPackBean, true);
         }
         if (!StringUtils.isEmpty(workOrderQueryDto.getEndTimeStart()) || !StringUtils.isEmpty(workOrderQueryDto.getEndTimeEnd())) {
-            DdlPreparedPack.timeBuilder(workOrderQueryDto.getEndTimeStart(), workOrderQueryDto.getEndTimeEnd(), "endTime", ddlPackBean, true);
-        }
-        if (!StringUtils.isEmpty(workOrderQueryDto.getEndTimeStart()) || !StringUtils.isEmpty(workOrderQueryDto.getEndTimeEnd())) {
-            DdlPreparedPack.timeBuilder(workOrderQueryDto.getEndTimeStart(), workOrderQueryDto.getEndTimeEnd(), "endTime", ddlPackBean, true);
+            DdlPreparedPack.timeBuilder(workOrderQueryDto.getEndTimeStart(), workOrderQueryDto.getEndTimeEnd(), MesPcnExtConstWords.END_TIME, ddlPackBean, true);
         }
 
         if (StringUtils.isEmpty(workOrderQueryDto.getOrderByParam())) {

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/WorkOrderQueryDto.java

@@ -98,5 +98,8 @@ public class WorkOrderQueryDto {
     )
     public transient Integer ascOrDesc = 1;
 
+    @ApiParam(value = "是否包含删除的工单")
+    public String isHasDel;
+
 
 }