其他异常提交（已完成）

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java

@@ -6,13 +6,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.foreverwin.mesnac.anomaly.model.AbnormalBill;
 import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose;
 import com.foreverwin.mesnac.anomaly.service.AbnormalBillService;
-import com.foreverwin.mesnac.common.helper.NextNumberHelper;
-import com.foreverwin.mesnac.meapi.controller.DataFieldListController;
 import com.foreverwin.mesnac.meapi.controller.NcCodeController;
 import com.foreverwin.mesnac.meapi.controller.WorkCenterController;
 import com.foreverwin.mesnac.meapi.model.DataField;
 import com.foreverwin.mesnac.meapi.model.NcCode;
 import com.foreverwin.mesnac.meapi.model.WorkCenter;
+import com.foreverwin.mesnac.meapi.service.DataFieldListService;
 import com.foreverwin.mesnac.meapi.service.NcCodeService;
 import com.foreverwin.modular.core.util.CommonMethods;
 import com.foreverwin.modular.core.util.FrontPage;
@@ -41,14 +40,11 @@ public class AbnormalBillController {
     @Autowired
     private WorkCenterController workCenterController;
 
-    @Autowired
-    private NextNumberHelper nextNumberHelper;
-
     @Autowired
     private NcCodeController ncCodeController;
 
     @Autowired
-    private DataFieldListController dataFieldListController;
+    private DataFieldListService dataFieldListService;
 
     /**
     * 根据id查询
@@ -170,6 +166,11 @@ public class AbnormalBillController {
         return R.ok(abnormalBillService.removeByIds(ids));
     }
 
+    /**
+     * 初始化
+     * @param messageType
+     * @return
+     */
     @GetMapping("/init")
     public R init(String messageType){
         HashMap<String, Object> hashMap = new HashMap<>();
@@ -192,25 +193,19 @@ public class AbnormalBillController {
         DataField dataField = new DataField();
         dataField.setSite(site);
         dataField.setDataField("RESPONSIBILITY_DEPARTMENT");
-        R dutyDepart = dataFieldListController.findDataFieldListById(dataField);
-        hashMap.put("dutyDepart",dutyDepart);
+        List<DataField> dutyDepartList = dataFieldListService.findDataFieldListById(dataField);
+        hashMap.put("dutyDepart",dutyDepartList);
         //责任分类
         dataField.setDataField("RESPONSIBILITY_TYPE");
-        R dutyType = dataFieldListController.findDataFieldListById(dataField);
-        hashMap.put("dutyType",dutyType);
+        List<DataField> dutyTypeList = dataFieldListService.findDataFieldListById(dataField);
+        hashMap.put("dutyType",dutyTypeList);
         return R.ok(hashMap);
     }
 
-    @GetMapping("/findAllUserByUserGroup")
-    public R findAllUserByUserGroup(String site, String userGroups){
-        return R.ok();
-    }
-    @GetMapping("/getNextNumber")
-    public R getNextNumber(String numberType){
-        String site = CommonMethods.getSite();
-        List<String> nextNumber = nextNumberHelper.getNextNumber(site, numberType, 1, null);
-        return R.ok(nextNumber.get(0));
-    }
+//    @GetMapping("/findAllUserByUserGroup")
+//    public R findAllUserByUserGroup(String site, String userGroups){
+//        return R.ok();
+//    }
 
     /**
      * 异常提报
@@ -222,6 +217,12 @@ public class AbnormalBillController {
         return R.ok(abnormalBillService.anomalyReportOther(abnormalBill, abnormalBillDispose));
     }
 
+    /**
+     * 取消原因
+     * @param handle
+     * @param cancelBrowse
+     * @return
+     */
     @GetMapping("/cancelBrowse")
     public R cancelBrowse(String handle, String cancelBrowse){
         abnormalBillService.cancelBrowse(handle,cancelBrowse);

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java

@@ -1,8 +1,8 @@
 package com.foreverwin.mesnac.anomaly.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.foreverwin.mesnac.anomaly.model.AbnormalBill;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.foreverwin.mesnac.anomaly.model.AbnormalBill;
 import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose;
 import com.foreverwin.modular.core.util.FrontPage;
 
@@ -37,4 +37,5 @@ public interface AbnormalBillService extends IService<AbnormalBill> {
     void generateAbnormalBill(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose);
 
     void cancelBrowse(String handle,String cancelBrowse);
+
 }

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java

@@ -3,7 +3,6 @@ package com.foreverwin.mesnac.anomaly.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.foreverwin.mesnac.anomaly.mapper.AbnormalBillDisposeMapper;
 import com.foreverwin.mesnac.anomaly.mapper.AbnormalBillMapper;
 import com.foreverwin.mesnac.anomaly.model.AbnormalBill;
 import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose;
@@ -12,6 +11,11 @@ import com.foreverwin.mesnac.anomaly.service.AbnormalBillService;
 import com.foreverwin.mesnac.common.enums.HandleEnum;
 import com.foreverwin.mesnac.common.helper.NextNumberHelper;
 import com.foreverwin.mesnac.common.util.StringUtil;
+import com.foreverwin.mesnac.meapi.mapper.NcGroupMapper;
+import com.foreverwin.mesnac.meapi.mapper.ResrceMapper;
+import com.foreverwin.mesnac.meapi.model.NcGroup;
+import com.foreverwin.mesnac.meapi.model.Resrce;
+import com.foreverwin.mesnac.meapi.service.NwaUserService;
 import com.foreverwin.modular.core.exception.BusinessException;
 import com.foreverwin.modular.core.util.CommonMethods;
 import com.foreverwin.modular.core.util.FrontPage;
@@ -41,11 +45,18 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
     private NextNumberHelper nextNumberHelper;
 
     @Autowired
-    private AbnormalBillDisposeMapper abnormalBillDisposeMapper;
+    private NcGroupMapper ncGroupMapper;
 
     @Autowired
     private AbnormalBillDisposeService abnormalBillDisposeService;
 
+    @Autowired
+    private ResrceMapper resrceMapper;
+
+    @Autowired
+    private NwaUserService nwaUserService;
+
+
     @Override
     public IPage<AbnormalBill> selectPage(FrontPage<AbnormalBill> frontPage, AbnormalBill abnormalBill) {
         QueryWrapper<AbnormalBill> queryWrapper = new QueryWrapper<>();
@@ -107,13 +118,25 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         abnormalBillDispose.setModifiedDateTime(currentTime);
         abnormalBillDispose.setModifiedUser(user);
 
-        //判断SFC和设备编号是否为空
+        //判断SFC、设备编号、消息类型是否不正确或为空
         if(StringUtil.isBlank(abnormalBill.getSfc())){
             throw BusinessException.build("产品条码不能为空");
         }
         if(StringUtil.isBlank(abnormalBill.getResrce())){
             throw BusinessException.build("设备编号不能为空");
         }
+        if(!StringUtil.isBlank(abnormalBill.getMessageType())){
+            NcGroup messageType = ncGroupMapper.selectById(HandleEnum.NC_GROUP.getHandle(abnormalBill.getSite(), abnormalBill.getMessageType()));
+            if(messageType == null){
+                throw BusinessException.build("该消息类型不存在");
+            }
+        }
+        Resrce resrce = resrceMapper.selectById(HandleEnum.RESOURCE.getHandle(abnormalBill.getSite(), abnormalBill.getResrce()));
+        if(resrce == null){
+            throw BusinessException.build("该设备编号不存在");
+        }
+        //判断输入的用户组是否正确，并返回对应的用户
+        nwaUserService.checkUserGroup(abnormalBillDispose.getDutySendUserGroup());
     }
 
     @Override
@@ -127,4 +150,6 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
     }
 
 
+
+
 }

common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java

@@ -100,7 +100,13 @@ public enum HandleEnum {
     Z_ABNORMAL_BILL("AbnormalBillBo","AbnormalBillBo:{0},{1}"),
 
     /**异常单详细表**/
-    Z_ABNORMAL_BILL_DISPOSE("AbnormalBillDisposeBo","AbnormalBillDisposeBo:{0},{1}");
+    Z_ABNORMAL_BILL_DISPOSE("AbnormalBillDisposeBo","AbnormalBillDisposeBo:{0},{1}"),
+
+    /**不良代码**/
+    NC_CODE("NCCodeBO","NCCodeBO:{0},{1}"),
+
+    /**不良代码组**/
+    NC_GROUP("NCGroupBO","NCGroupBO:{0},{1}");
 
 
     private String prefix;

meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DataFieldListController.java

@@ -2,7 +2,6 @@ package com.foreverwin.mesnac.meapi.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.foreverwin.mesnac.meapi.model.DataField;
 import com.foreverwin.mesnac.meapi.model.DataFieldList;
 import com.foreverwin.mesnac.meapi.service.DataFieldListService;
 import com.foreverwin.modular.core.util.FrontPage;
@@ -120,12 +119,5 @@ public class DataFieldListController {
         return R.ok(dataFieldListService.removeByIds(ids));
     }
 
-    /**
-     * 根据handle找到数据字段定义维护中的数据字段列表
-     * @return
-     */
-    @GetMapping("findDataFieldListById")
-    public R findDataFieldListById(DataField dataField){
-        return R.ok(dataFieldListService.findDataFieldListById(dataField));
-    }
+
 }

meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcCodeController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.foreverwin.mesnac.meapi.model.NcCode;
 import com.foreverwin.mesnac.meapi.service.NcCodeService;
+import com.foreverwin.modular.core.util.CommonMethods;
 import com.foreverwin.modular.core.util.FrontPage;
 import com.foreverwin.modular.core.util.R;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,6 +62,8 @@ public class NcCodeController {
     public R page(FrontPage<NcCode> frontPage, NcCode ncCode){
         IPage result;
         QueryWrapper<NcCode> queryWrapper = new QueryWrapper<>();
+        String site = CommonMethods.getSite();
+        ncCode.setSite(site);
         queryWrapper.setEntity(ncCode);
         if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) {
             //TODO modify global query

meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcGroupController.java

@@ -1,16 +1,15 @@
 package com.foreverwin.mesnac.meapi.controller;
 
-import com.foreverwin.modular.core.util.R;
-import com.foreverwin.modular.core.util.FrontPage;
-import com.foreverwin.modular.core.util.CommonMethods;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.foreverwin.mesnac.meapi.model.NcGroup;
+import com.foreverwin.mesnac.meapi.service.NcGroupService;
+import com.foreverwin.modular.core.util.CommonMethods;
+import com.foreverwin.modular.core.util.FrontPage;
+import com.foreverwin.modular.core.util.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import com.foreverwin.mesnac.meapi.service.NcGroupService;
-import com.foreverwin.mesnac.meapi.model.NcGroup;
 import java.util.List;
 
 /**
@@ -63,6 +62,8 @@ public class NcGroupController {
     public R page(FrontPage<NcGroup> frontPage, NcGroup ncGroup){
         IPage result;
         QueryWrapper<NcGroup> queryWrapper = new QueryWrapper<>();
+        String site = CommonMethods.getSite();
+        ncGroup.setSite(site);
         queryWrapper.setEntity(ncGroup);
         if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) {
             //TODO modify global query

meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/SfcController.java

@@ -56,6 +56,7 @@ public class SfcController {
     @GetMapping("")
     public R getSfcList(Sfc sfc){
         List<Sfc> result;
+        sfc.setSite(CommonMethods.getSite());
         QueryWrapper<Sfc> queryWrapper = new QueryWrapper<>();
         queryWrapper.setEntity(sfc);
         result = sfcService.list(queryWrapper);
@@ -138,10 +139,4 @@ public class SfcController {
         return R.ok(sfcService.removeByIds(ids));
     }
 
-    @GetMapping("findBySfc")
-    public R findBySfc(Sfc sfc){
-        sfc.setSite(CommonMethods.getSite());
-        return R.ok(sfcService.findBySfc(sfc));
-    }
-
 }

meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java

@@ -69,9 +69,14 @@ public class ShopOrderController {
         return R.ok(result);
     }
 
-    @GetMapping("findByIdAndPlannedItemBo")
-    public R findByIdAndPlannedItemBo(String handle,String plannedItemBo){
-        return R.ok(shopOrderService.findByIdAndPlannedItemBo(handle,plannedItemBo));
+    /**
+     * 根据handle找到对应的工单并且该工单是下达的
+     * @param handle
+     * @return
+     */
+    @GetMapping("/findById")
+    public R findById(String handle){
+        return R.ok(shopOrderService.findById(handle));
     }
 
     /**

meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DataFieldListMapper.java

@@ -19,6 +19,11 @@ import java.util.List;
 @Repository
 public interface DataFieldListMapper extends BaseMapper<DataFieldList> {
 
+    /**
+     * 根据handle找到数据字段定义维护中的数据字段列表
+     * @param dataField
+     * @return
+     */
     List<DataField> findDataFieldListById(@Param("dataField") DataField dataField,@Param("locale")String locale);
 
 }

meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NwaUserMapper.java

@@ -20,4 +20,6 @@ public interface NwaUserMapper extends BaseMapper<NwaUser> {
     NwaUser findUserByUserName(@Param("site")String site, @Param("user")String user);
 
     List<NwaUser> findAllUser(@Param("site")String site);;
+
+    List<NwaUser> selectAllByUserGroups(@Param("site")String site,@Param("list")List<String> list);
 }

meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/SfcMapper.java

@@ -24,6 +24,4 @@ public interface SfcMapper extends BaseMapper<Sfc> {
     List<Sfc> getSfcListByResrceBO(String resrceBO);
 
     SfcDto findSfcData(@Param("site") String site, @Param("sfc") String sfc);
-
-    Sfc findBySfc(@Param("sfc") Sfc sfc);
 }

meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ShopOrderMapper.java

@@ -17,9 +17,7 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface ShopOrderMapper extends BaseMapper<ShopOrder> {
 
-    ShopOrder findByIdAndPlannedItemBo(@Param("handle")String handle,
-                                       @Param("plannedItemBo")String plannedItemBo,
-                                       @Param("status501")String status501);
+    ShopOrder findById(@Param("handle")String handle,@Param("status501")String status501);
 
     ShopOrderDto findByShopOrderBo(@Param("handle")String handle);
 }

meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java

@@ -1,9 +1,12 @@
 package com.foreverwin.mesnac.meapi.mapper;
 
-import com.foreverwin.mesnac.meapi.model.UserGroup;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.foreverwin.mesnac.meapi.model.UserGroup;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -15,4 +18,6 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface UserGroupMapper extends BaseMapper<UserGroup> {
 
+     int checkUserGroup(@Param("site")String site, @Param("list")List<String> item);
+
 }

meapi/src/main/java/com/foreverwin/mesnac/meapi/service/DataFieldListService.java

@@ -27,5 +27,10 @@ public interface DataFieldListService extends IService<DataFieldList> {
 
     List<DataFieldList> selectList(DataFieldList dataFieldList);
 
+    /**
+     * 根据handle找到数据字段定义维护中的数据字段列表
+     * @param dataField
+     * @return
+     */
     List<DataField> findDataFieldListById(DataField dataField);
 }

meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NwaUserService.java

@@ -29,4 +29,12 @@ public interface NwaUserService extends IService<NwaUser> {
     NwaUser findUserByUserName(String id);
 
     List<NwaUser> findAllUser();
+
+
+    /**
+     * 检验用户组，并根据用户组查找到用户组下的所有的用户
+     * @param userGroups
+     * @return
+     */
+    List<NwaUser> checkUserGroup(String userGroups);
 }

meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcService.java

@@ -1,9 +1,8 @@
 package com.foreverwin.mesnac.meapi.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.foreverwin.mesnac.meapi.dto.SfcDto;
-import com.foreverwin.mesnac.meapi.model.Sfc;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.foreverwin.mesnac.meapi.dto.SfcDto;
 import com.foreverwin.mesnac.meapi.model.Sfc;
 import com.foreverwin.modular.core.util.FrontPage;
 
@@ -38,8 +37,6 @@ public interface SfcService extends IService<Sfc> {
      */
     List<Sfc> getSfcListByResrceBO(String resrceBO);
 
-    Sfc findBySfc(Sfc sfc);
-
     /**
      * 查询生产批次的基本信息
      *

meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ShopOrderService.java

@@ -27,7 +27,12 @@ public interface ShopOrderService extends IService<ShopOrder> {
 
     List<ShopOrder> selectList(ShopOrder shopOrder);
 
-    ShopOrder findByIdAndPlannedItemBo(String handle,String plannedItemBo);
+    /**
+     * 根据handle找到对应的可下达的工单
+     * @param handle
+     * @return
+     */
+    ShopOrder findById(String handle);
 
     ShopOrderDto findByShopOrderBo(String handle);
 

meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NwaUserServiceImpl.java

@@ -1,17 +1,22 @@
 package com.foreverwin.mesnac.meapi.service.impl;
 
-import com.foreverwin.modular.core.util.CommonMethods;
-import com.foreverwin.modular.core.util.FrontPage;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.foreverwin.mesnac.meapi.model.NwaUser;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mesnac.meapi.mapper.NwaUserMapper;
+import com.foreverwin.mesnac.meapi.mapper.UserGroupMapper;
+import com.foreverwin.mesnac.meapi.model.NwaUser;
 import com.foreverwin.mesnac.meapi.service.NwaUserService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
+import com.foreverwin.mesnac.meapi.util.StringUtils;
+import com.foreverwin.modular.core.exception.BusinessException;
+import com.foreverwin.modular.core.util.CommonMethods;
+import com.foreverwin.modular.core.util.FrontPage;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 /**
  * <p>
@@ -29,6 +34,9 @@ public class NwaUserServiceImpl extends ServiceImpl<NwaUserMapper, NwaUser> impl
     @Autowired
     private NwaUserMapper nwaUserMapper;
 
+    @Autowired
+    private UserGroupMapper userGroupMapper;
+
     @Override
     public IPage<NwaUser> selectPage(FrontPage<NwaUser> frontPage, NwaUser nwaUser) {
         QueryWrapper<NwaUser> queryWrapper = new QueryWrapper<>();
@@ -55,5 +63,28 @@ public class NwaUserServiceImpl extends ServiceImpl<NwaUserMapper, NwaUser> impl
         return nwaUserMapper.findAllUser(site);
     }
 
+    @Override
+    public List<NwaUser> checkUserGroup(String userGroups) {
+        String site = CommonMethods.getSite();
+        List<String> item = new ArrayList<String>();
+        if(StringUtils.isBlank(userGroups)){
+            return null;
+        }
+        if (!userGroups.contains(",")) {
+            item.add(userGroups);
+        } else {
+            String[] userGroupss = userGroups.split(",");
+            item.addAll(Arrays.asList(userGroupss));
+        }
+        //判断用户组是否输入正确
+        int length = userGroupMapper.checkUserGroup(site, item);
+        if(item.size() != length){
+            throw BusinessException.build("用户组输入不正确");
+        }
+        //根据用户组找到所有的用户
+        List<NwaUser> nwaUsers = nwaUserMapper.selectAllByUserGroups(site, item);
+        return nwaUsers;
+    }
+
 
 }

meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/SfcServiceImpl.java

@@ -58,10 +58,7 @@ public class SfcServiceImpl extends ServiceImpl<SfcMapper, Sfc> implements SfcSe
         return sfc;
     }
 
-    @Override
-    public Sfc findBySfc(Sfc sfc) {
-        return sfcMapper.findBySfc(sfc);
-    }
+
 
     @Override
     public SfcDto findSfcData(String site, String sfc) {

meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ShopOrderServiceImpl.java

@@ -46,10 +46,10 @@ public class ShopOrderServiceImpl extends ServiceImpl<ShopOrderMapper, ShopOrder
     }
 
     @Override
-    public ShopOrder findByIdAndPlannedItemBo(String handle, String plannedItemBo) {
+    public ShopOrder findById(String handle) {
         String site = CommonMethods.getSite();
         String status501 = new StatusBOHandle(site,"501").getValue();
-        return shopOrderMapper.findByIdAndPlannedItemBo(handle,plannedItemBo,status501);
+        return shopOrderMapper.findById(handle,status501);
     }
 
     @Override

meapi/src/main/resources/mapper/NwaUserMapper.xml

@@ -571,5 +571,19 @@
         </foreach>)
     </delete>
     <!-- BaseMapper标准查询/修改/删除 -->
-
+    <select id="selectAllByUserGroups" resultMap="BaseResultMap">
+        SELECT ZNU.USER_NAME USER_NAME,ZNU.FULL_NAME FULL_NAME
+        FROM USER_GROUP UG
+        INNER JOIN USER_GROUP_MEMBER UGM ON UG.HANDLE = UGM.USER_GROUP_BO
+        INNER JOIN USR ON UGM.USER_OR_GROUP_GBO  = USR.HANDLE
+        INNER JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME  = USR.USER_ID
+        WHERE UG.SITE = #{site}
+        <if test="list != null and list.size > 0">
+            AND UG.USER_GROUP IN (
+                <foreach collection="list" index="index" separator="," item="item">
+                    UPPER(#{item})
+                </foreach>
+            )
+        </if>
+    </select>
 </mapper>

meapi/src/main/resources/mapper/SfcMapper.xml

@@ -645,26 +645,7 @@
         ORDER BY IW.DATE_STARTED DESC
     </select>
 
-    <select id="findBySfc" resultType="com.foreverwin.mesnac.meapi.model.Sfc">
-        SELECT <include refid="Base_Column_List"></include>
-        FROM SFC
-        <where>
-            <if test="sfc != null">
-                <if test="sfc.site != null and sfc.site != ''">
-                    SITE = #{sfc.site}
-                </if>
-                <if test="sfc.handle != null and sfc.handle != ''">
-                    AND HANDLE = #{sfc.handle}
-                </if>
-                <if test="sfc.itemBo != null and sfc.itemBo != ''">
-                    AND ITEM_BO = #{sfc.itemBo}
-                </if>
-                <if test="sfc.shopOrderBo != null and sfc.shopOrderBo != ''">
-                    AND SHOP_ORDER_BO = #{sfc.shopOrderBo}
-                </if>
-            </if>
-        </where>
-    </select>
+
 
     <select id="findSfcData" resultMap="FullResultMap">
         SELECT SC.SITE, SC.SFC, SO.SHOP_ORDER, SC.QTY, SC.QTY_DONE, ST.STATUS, IM.ITEM, IT.DESCRIPTION ITEM_DESCRIPTION, OP.OPERATION, OT.DESCRIPTION OPERATION_DESCRIPTION, OTT.DESCRIPTION PREPOSITION_OPERATION

meapi/src/main/resources/mapper/ShopOrderMapper.xml

@@ -992,7 +992,7 @@
     </delete>
 
     <!-- BaseMapper标准查询/修改/删除 -->
-    <select id="findByIdAndPlannedItemBo" resultMap="BaseResultMap">
+    <select id="findById" resultMap="BaseResultMap">
         SELECT <include refid="Base_Column_List"></include>
         FROM SHOP_ORDER
         <where>
@@ -1000,9 +1000,6 @@
             <if test="handle != null and handle != ''">
                AND HANDLE = #{handle}
             </if>
-            <if test="plannedItemBo != null and plannedItemBo != ''">
-               AND PLANNED_ITEM_BO = #{plannedItemBo}
-            </if>
         </where>
     </select>
 

meapi/src/main/resources/mapper/UserGroupMapper.xml

@@ -328,5 +328,14 @@
     </delete>
 
     <!-- BaseMapper标准查询/修改/删除 -->
-
+    <select id="checkUserGroup" resultType="integer">
+        SELECT COUNT(*)
+        FROM USER_GROUP
+        WHERE SITE=#{site}
+        <if test="list != null and !list.isEmpty">
+            AND USER_GROUP IN (
+            <foreach item="item" index="index" collection="list" separator=",">UPPER(#{item})
+            </foreach>)
+        </if>
+    </select>
 </mapper>