修改出库人员按物料类别分类

src/main/java/com/dreamchaser/depository_manage/controller/PageController.java

@@ -2056,6 +2056,17 @@ public class PageController {
                 mv.addObject("cdisplay", "none");
             }
 
+            Integer role = userToken.getIsadmin();
+            if (role == null) {
+                role = 1;
+            }
+
+            if (Integer.compare(userToken.getMaindeparment(), 361) == 0 || Integer.compare(role, 4) == 0) {
+                mv.addObject("display", "inline-block");
+            }else{
+                mv.addObject("display", "none");
+
+            }
 
 
             applicationOutRecordPById.setApplicantName(userByPort.getName());

src/main/java/com/dreamchaser/depository_manage/mapper/RoleMapper.java

@@ -92,6 +92,14 @@ public interface RoleMapper {
      */
     List<Integer> findUserIdByDid(Integer did);
 
+
+    /**
+     * 根据类型id获取userId
+     * @param mtId
+     * @return
+     */
+    List<Integer> findUserIdByMtId(Long mtId);
+
     /**
      * 根据条件获取权限
      *

src/main/java/com/dreamchaser/depository_manage/mapper/RoleMapper.xml

@@ -165,6 +165,10 @@
         select userid from postoruserrole  where 1 = 1 and did = #{did}  and classes in (1,2) group by userid
     </select>
 
+    <select id="findUserIdByMtId" parameterType="long" resultType="int">
+        select uid from mtanduserrole  where 1 = 1 and mtid = #{mtId}  and classes in (1,2) group by uid
+    </select>
+
     <select id="findRoleAndDepositoryByCondition" parameterType="map" resultMap="depositoryAndrole">
         select
         <include refid="roleNameAnddepositoryName"/>

src/main/java/com/dreamchaser/depository_manage/service/RoleService.java

@@ -48,12 +48,19 @@ public interface RoleService {
 
 
     /**
-     * 根据仓库获取
+     * 根据仓库获取userId
      * @param did
      * @return
      */
     List<Integer> findUserIdByDid(Integer did);
 
+    /**
+     * 根据类型id获取userId
+     * @param mtId
+     * @return
+     */
+    List<Integer> findUserIdByMtId(Long mtId);
+
     /**
      * 根据条件获取管理仓库权限
      * @param map 查询条件

src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java

@@ -1951,7 +1951,6 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
 //        Integer maindeparment = userByPort.getMaindeparment();
 
         if (!flagForFirst) {
-//        if (Integer.compare(361, maindeparment) == 0) {
 
             String depositoryManagerTime = recordP.getDepositoryManagerTime();
             if ("0".equals(depositoryManagerTime)) {
@@ -1979,29 +1978,34 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
 
                     StringBuilder minRecordByMain = new StringBuilder("[]");
 
-                    // 根据仓库分类明细
+                    // 根据物料类型分类明细
-                    Map<String, Object> minIdByDepository = new HashMap<>();
+                    Map<String, Object> minIdByMaterialType = new HashMap<>();
                     // 定义仓库列表
-                    List<Integer> depositoryIdList = new ArrayList<>();
+                    List<Long> materialTypeIdList = new ArrayList<>();
                     // 获取所有详情
                     List<ApplicationOutRecordMin> applicationOutRecordMinByParent = depositoryRecordMapper.findApplicationOutRecordMinByParent(recordP.getId());
                     for (ApplicationOutRecordMin applicationOutRecordMin : applicationOutRecordMinByParent) {
                         // 获取子单信息
 
+                        // 获取对应的物料编号
+                        Integer mid = applicationOutRecordMin.getMid();
+                        // 获取物料信息
+                        Inventory inventory = materialMapper.findInventoryById(mid);
+
                         // 获取当前仓库下的子订单
-                        Integer depositoryId = applicationOutRecordMin.getDepositoryId();
+                        Long materialTypeId = inventory.getMaterialTypeId();
-                        if (!findThisIdIsExist(depositoryIdList, depositoryId)) {
+                        if (!findThisIdIsExist(materialTypeIdList, materialTypeId)) {
                             // 如果当前仓库id没有存入过
-                            depositoryIdList.add(depositoryId);
+                            materialTypeIdList.add(materialTypeId);
                         }
                         List<Integer> minIdList = new ArrayList<>();
-                        Object o = minIdByDepository.get("depository" + depositoryId);
+                        Object o = minIdByMaterialType.get("materialType" + materialTypeId);
                         if (o != null) {
                             minIdList = (List<Integer>) o;
                         }
                         // 将当前子订单添加到该仓库下的子订单列表中
                         minIdList.add(applicationOutRecordMin.getId());
-                        minIdByDepository.put("depository" + depositoryId, minIdList);
+                        minIdByMaterialType.put("materialType" + materialTypeId, minIdList);
 
                         //设置子订单在redis中的主键
                         String minRecordKey = "minRecord:" + applicationOutRecordMin.getId();
@@ -2013,13 +2017,10 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                         Map<String, Object> minRecord = new HashMap<>();
                         minRecord.put("parentId", recordP.getId().toString()); // 当前子订单主订单
                         minRecord.put("state", "1"); // 当前子订单状态 1待处理2处理
-                        // 获取对应的物料编号
+
-                        Integer mid = applicationOutRecordMin.getMid();
-                        // 获取物料信息
-                        Inventory inventory = materialMapper.findInventoryById(mid);
                         // 获取该物料所处仓库的仓库管理员
                         List<Integer> userIdByDid = new ArrayList<>();
-                        userIdByDid = roleService.findUserIdByDid(inventory.getDepositoryId());
+                        userIdByDid = roleService.findUserIdByMtId(inventory.getMaterialTypeId());
                         StringBuilder QyWxUid = new StringBuilder();
                         for (Integer integer : userIdByDid) {
                             // 获取仓库管理员信息
@@ -2566,31 +2567,34 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                 // 获取主单下的所有子单
 
                 // 根据仓库分类明细
-                Map<String, Object> minIdByDepository = new HashMap<>();
+                Map<String, Object> minIdByMaterialType = new HashMap<>();
                 // 定义仓库列表
-                List<Integer> depositoryIdList = new ArrayList<>();
+                List<Long> materialTypeIdList = new ArrayList<>();
 
 
                 StringBuilder minRecordByMain = new StringBuilder("[]");
                 List<ApplicationOutRecordMin> applicationOutRecordMinByParent = depositoryRecordMapper.findApplicationOutRecordMinByParent(record.getId());
-                for (int i = 0; i < applicationOutRecordMinByParent.size(); i++) {
+                for (ApplicationOutRecordMin applicationOutRecordMin : applicationOutRecordMinByParent) {
                     // 获取子单信息
-                    ApplicationOutRecordMin applicationOutRecordMin = applicationOutRecordMinByParent.get(i);
+                    // 获取对应的物料编号
+                    Integer mid = applicationOutRecordMin.getMid();
+                    // 获取物料信息
+                    Inventory inventory = materialMapper.findInventoryById(mid);
 
                     // 获取当前仓库下的子订单
-                    Integer depositoryId = applicationOutRecordMin.getDepositoryId();
+                    Long materialTypeId = inventory.getMaterialTypeId();
-                    if (!findThisIdIsExist(depositoryIdList, depositoryId)) {
+                    if (!findThisIdIsExist(materialTypeIdList, materialTypeId)) {
                         // 如果当前仓库id没有存入过
-                        depositoryIdList.add(depositoryId);
+                        materialTypeIdList.add(materialTypeId);
                     }
                     List<Integer> minIdList = new ArrayList<>();
-                    Object o = minIdByDepository.get("depository" + depositoryId);
+                    Object o = minIdByMaterialType.get("materialType" + materialTypeId);
                     if (o != null) {
                         minIdList = (List<Integer>) o;
                     }
                     // 将当前子订单添加到该仓库下的子订单列表中
                     minIdList.add(applicationOutRecordMin.getId());
-                    minIdByDepository.put("depository" + depositoryId, minIdList);
+                    minIdByMaterialType.put("materialType" + materialTypeId, minIdList);
 
                     //设置子订单在redis中的主键
                     String minRecordKey = "minRecord:" + applicationOutRecordMin.getId();
@@ -2601,13 +2605,10 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                     Map<String, Object> minRecord = new HashMap<>();
                     minRecord.put("parentId", record.getId().toString()); // 当前子订单主订单
                     minRecord.put("state", "1"); // 当前子订单状态 1待处理2处理
-                    // 获取对应的物料编号
+
-                    Integer mid = applicationOutRecordMin.getMid();
-                    // 获取物料信息
-                    Inventory inventory = materialMapper.findInventoryById(mid);
                     // 获取该物料所处仓库的仓库管理员
                     List<Integer> userIdByDid = new ArrayList<>();
-                    userIdByDid = roleService.findUserIdByDid(inventory.getDepositoryId());
+                    userIdByDid = roleService.findUserIdByMtId(inventory.getMaterialTypeId());
                     // 用于保存仓库管理员的企业微信openid
                     StringBuilder QyWxUid = new StringBuilder();
                     for (Integer integer : userIdByDid) {
@@ -2902,29 +2903,32 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                 map.put("depositoryManagerPass", 1);
 
                 // 根据仓库分类明细
-                Map<String, Object> minIdByDepository = new HashMap<>();
+                Map<String, Object> minIdByMaterialType = new HashMap<>();
                 // 定义仓库列表
-                List<Integer> depositoryIdList = new ArrayList<>();
+                List<Long> materialTypeIdList = new ArrayList<>();
 
                 StringBuilder minRecordByMain = new StringBuilder("[]");
                 List<ApplicationOutRecordMin> applicationOutRecordMinByParent = depositoryRecordMapper.findApplicationOutRecordMinByParent(recordP.getId());
-                for (int i = 0; i < applicationOutRecordMinByParent.size(); i++) {
+                for (ApplicationOutRecordMin applicationOutRecordMin : applicationOutRecordMinByParent) {
                     // 获取子单信息
-                    ApplicationOutRecordMin applicationOutRecordMin = applicationOutRecordMinByParent.get(i);
+                    // 获取对应的物料编号
+                    Integer mid = applicationOutRecordMin.getMid();
+                    // 获取物料信息
+                    Inventory materialById = materialMapper.findInventoryById(mid);
                     // 获取当前仓库下的子订单
-                    Integer depositoryId = applicationOutRecordMin.getDepositoryId();
+                    Long materialTypeId = materialById.getMaterialTypeId();
-                    if (!findThisIdIsExist(depositoryIdList, depositoryId)) {
+                    if (!findThisIdIsExist(materialTypeIdList, materialTypeId)) {
                         // 如果当前仓库id没有存入过
-                        depositoryIdList.add(depositoryId);
+                        materialTypeIdList.add(materialTypeId);
                     }
                     List<Integer> minIdList = new ArrayList<>();
-                    Object o = minIdByDepository.get("depository" + depositoryId);
+                    Object o = minIdByMaterialType.get("materialType" + materialTypeId);
                     if (o != null) {
                         minIdList = (List<Integer>) o;
                     }
                     // 将当前子订单添加到该仓库下的子订单列表中
                     minIdList.add(applicationOutRecordMin.getId());
-                    minIdByDepository.put("depository" + depositoryId, minIdList);
+                    minIdByMaterialType.put("materialType" + materialTypeId, minIdList);
                     //设置子订单在redis中的主键
                     String minRecordKey = "minRecord:" + applicationOutRecordMin.getId();
                     minRecordByMain.insert(1, minRecordKey + ","); // 将子订单主键插入到主订单的子订单列表
@@ -2934,13 +2938,10 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                     Map<String, Object> minRecord = new HashMap<>();
                     minRecord.put("parentId", recordP.getId().toString()); // 当前子订单主订单
                     minRecord.put("state", "1"); // 当前子订单状态 1待处理2处理
-                    // 获取对应的物料编号
+
-                    Integer mid = applicationOutRecordMin.getMid();
-                    // 获取物料信息
-                    Material materialById = materialMapper.findMaterialById(mid);
                     // 获取该物料所处仓库的仓库管理员
                     List<Integer> userIdByDid = new ArrayList<>();
-                    userIdByDid = roleService.findUserIdByDid(materialById.getDepositoryId());
+                    userIdByDid = roleService.findUserIdByMtId(materialById.getMaterialTypeId());
                     StringBuilder QyWxUid = new StringBuilder();
                     for (int j = 0; j < userIdByDid.size(); j++) {
                         // 获取仓库管理员信息
@@ -4652,10 +4653,10 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
      * @param id
      * @return
      */
-    public Boolean findThisIdIsExist(List<Integer> ids, Integer id) {
+    public Boolean findThisIdIsExist(List<Long> ids, Long id) {
-        for (Integer depositoryId :
+        for (Long mtId :
                 ids) {
-            if (Integer.compare(id, depositoryId) == 0) {
+            if (Long.compare(id, mtId) == 0) {
                 return true;
             }
         }

src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java

@@ -515,8 +515,15 @@ public class ExcelServiceImpl implements ExcelService {
         excelInfoByWrite.setProducerName(userToken.getName());
         // 定义部门id
         Integer adminorgId = record.getAdminorgId();
-        // 定义部门
+
-        Administration company = null;
+        if (adminorgId != null ) {
+            Administration  company = LinkInterfaceUtil.getCompany(adminorgId, userToken);
+            // 设置部门名称
+            excelInfoByWrite.setAdminorgName(company.getName());
+        } else {
+            excelInfoByWrite.setAdminorgName("");
+        }
+
         for (int i = 1; i <= pagesum; i++) {
             // 定义打印子单数据
             List<ExcelInfoByMinWrite> dataMin = ListUtils.newArrayList();
@@ -561,22 +568,18 @@ public class ExcelServiceImpl implements ExcelService {
                 excelInfoByMinWrite.setPcode(pcode);
                 // 设置出库数量
                 excelInfoByMinWrite.setQuantity(String.valueOf(recordMin.getQuantity() / 100));
+                // 设置项目
+                excelInfoByMinWrite.setProject(recordMin.getProject());
                 // 添加到打印数据列表
                 dataMin.add(excelInfoByMinWrite);
                 // 添加总数
                 total += (double) (recordMin.getQuantity() / 100);
 
             }
-            if (adminorgId != null && company == null) {
+
-                company = LinkInterfaceUtil.getCompany(adminorgId, userToken);
+            if (record.getOutType() != null) {
-                // 设置部门名称
-                excelInfoByWrite.setAdminorgName(company.getName());
-            } else {
-                excelInfoByWrite.setAdminorgName("");
-            }
-            if (record.getApplyRemark() != null) {
                 // 设置出库类别
-                excelInfoByWrite.setType(record.getApplyRemark());
+                excelInfoByWrite.setType(record.getOutType());
             } else {
                 excelInfoByWrite.setType("");
 

src/main/java/com/dreamchaser/depository_manage/service/impl/RoleServiceImpl.java

@@ -93,11 +93,26 @@ public class RoleServiceImpl implements RoleService {
         return roleMapper.findRoleByUid(ObjectFormatUtil.toInteger(userid));
     }
 
+    /**
+     * 根据仓库获取userId
+     * @param did
+     * @return
+     */
     @Override
     public List<Integer> findUserIdByDid(Integer did) {
         return roleMapper.findUserIdByDid(did);
     }
 
+    /**
+     * 根据类型id获取userId
+     * @param mtId
+     * @return
+     */
+    @Override
+    public List<Integer> findUserIdByMtId(Long mtId) {
+        return roleMapper.findUserIdByMtId(mtId);
+    }
+
     /**
      * 根据条件获取权限
      *

src/main/resources/static/css/public.css

@@ -46,9 +46,9 @@ body {
     border: 1px solid #e6e6e6;
     padding: 10px 20px 5px 20px;
     color: #6b6b6b;
-    position: sticky;
+    /*position: sticky;*/
-    top: 0;
+    /*top: 0;*/
-    z-index: 999;
+    /*z-index: 999;*/
     background: #ffffff;
 }
 

src/main/resources/templates/pages/application/form-step-look_back.html

@@ -18,7 +18,7 @@
                 <div class="layui-card-body" style="padding-top: 0px;">
                     <div id="stepForm" lay-filter="stepForm" style="margin: 0 auto;">
                         <div style="margin-top: 30px">
-                            <button onclick="downloadExcel()">下载</button>
+                            <button th:style="'display:'+${display}" onclick="downloadExcel()">下载</button>
                             <table id="demo" class="layui-table"
                                    style="margin: 0 auto;max-width: 800px;">
                                 <colgroup>

src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html

@@ -57,7 +57,7 @@
     let flagForForm = false;
 
     layui.$(function () {
-        let wxScan = parent.parent.parent;
+        /*let wxScan = parent.parent.parent;
         if (wxScan.wx !== undefined) {
             wxScan = wxScan.wx;
         } else {
@@ -82,7 +82,12 @@
 
             }
 
-        });
+        });*/
+        var result = "1638361349087338496";//当needResult为1时返回处理结果
+        var req = {};
+        req.qrCode = result;
+        outboundLogic(req);
+
     });
 
 

target/classes/com/dreamchaser/depository_manage/mapper/RoleMapper.xml

@@ -165,6 +165,10 @@
         select userid from postoruserrole  where 1 = 1 and did = #{did}  and classes in (1,2) group by userid
     </select>
 
+    <select id="findUserIdByMtId" parameterType="long" resultType="int">
+        select uid from mtanduserrole  where 1 = 1 and mtid = #{mtId}  and classes in (1,2) group by uid
+    </select>
+
     <select id="findRoleAndDepositoryByCondition" parameterType="map" resultMap="depositoryAndrole">
         select
         <include refid="roleNameAnddepositoryName"/>

target/classes/static/css/public.css

@@ -46,9 +46,9 @@ body {
     border: 1px solid #e6e6e6;
     padding: 10px 20px 5px 20px;
     color: #6b6b6b;
-    position: sticky;
+    /*position: sticky;*/
-    top: 0;
+    /*top: 0;*/
-    z-index: 999;
+    /*z-index: 999;*/
     background: #ffffff;
 }
 

target/classes/templates/pages/application/form-step-look_back.html

@@ -18,7 +18,7 @@
                 <div class="layui-card-body" style="padding-top: 0px;">
                     <div id="stepForm" lay-filter="stepForm" style="margin: 0 auto;">
                         <div style="margin-top: 30px">
-                            <button onclick="downloadExcel()">下载</button>
+                            <button th:style="'display:'+${display}" onclick="downloadExcel()">下载</button>
                             <table id="demo" class="layui-table"
                                    style="margin: 0 auto;max-width: 800px;">
                                 <colgroup>

target/classes/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html

@@ -57,7 +57,7 @@
     let flagForForm = false;
 
     layui.$(function () {
-        let wxScan = parent.parent.parent;
+        /*let wxScan = parent.parent.parent;
         if (wxScan.wx !== undefined) {
             wxScan = wxScan.wx;
         } else {
@@ -82,7 +82,12 @@
 
             }
 
-        });
+        });*/
+        var result = "1638361349087338496";//当needResult为1时返回处理结果
+        var req = {};
+        req.qrCode = result;
+        outboundLogic(req);
+
     });