From ca11c70b287d3e6ea3e8a53e7c4b0436335640d1 Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Thu, 23 Feb 2023 10:07:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E5=90=88=E5=85=A5=E5=BA=93=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E9=A1=B5=E9=9D=A2=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/GroupController.java           | 13 +++
 .../mapper/DepositoryRecordMapper.xml         |  4 +-
 .../service/GroupService.java                 |  8 ++
 .../service/impl/GroupServiceImpl.java        | 18 +++-
 .../form-step-look_group_review.html          | 86 +++++++++++++++++++
 .../mapper/DepositoryRecordMapper.xml         |  4 +-
 6 files changed, 125 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java b/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java
index 68ea8909..e77c7b89 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java
@@ -546,6 +546,19 @@ public class GroupController {
         return CrudUtil.putHandle(result, integer);
     }
 
+    @PutMapping("/reviewIn")
+    public RestResponse reviewIn(@RequestBody Map<String, Object> map, HttpServletRequest request) {
+        UserByPort userToken = (UserByPort) request.getAttribute("userToken");
+        String header = request.getHeader("user-agent");
+        String crypt = Md5.crypt(header);
+        Integer review = groupService.reviewIn(map, userToken.getId(), userToken, crypt);
+        if (review != -1) {
+            return CrudUtil.postHandle(review, 1);
+        } else {
+            return new RestResponse("", 666, new StatusInfo("出库失败", "当前存储位库存不足，请重新选择"));
+        }
+    }
+
 
     /**
      * 用于构造组合出库单
diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
index 6ec74998..6a68b6ef 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
@@ -325,7 +325,7 @@
     <select id="findMyTaskIn" resultMap="simpleApplicationInRecordMap" parameterType="map">
         SELECT
         <include refid="simpleApplicationIn"/>
-        FROM applicationinrecordinfo WHERE 1=1 and airapproverPass != 4
+        FROM applicationinrecordinfo WHERE 1=1 and airapproverPass != 4 and airtoGroupId is null
         <if test='isDone == "0"'>
             and (FIND_IN_SET(#{userId},airapproverId) != 0 and airapproverPass = 3)
         </if>
@@ -341,7 +341,7 @@
     <select id="findMyTaskInCount" resultType="int" parameterType="map">
         SELECT
         count(*)
-        FROM applicationinrecordinfo WHERE 1=1 and airapproverPass != 4
+        FROM applicationinrecordinfo WHERE 1=1 and airapproverPass != 4 and airtoGroupId is null
         <if test='isDone == "0"'>
             and (FIND_IN_SET(#{userId},airapproverId) != 0 and airapproverPass = 3)
         </if>
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/GroupService.java b/src/main/java/com/dreamchaser/depository_manage/service/GroupService.java
index b9e3ecae..0e8bdeaf 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/GroupService.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/GroupService.java
@@ -208,6 +208,14 @@ public interface GroupService {
     List<GroupInfo> findGroupInfoByGid(Integer gid);
 
 
+    /**
+     * 入库审核申请
+     * @param map 仓库调度信息
+     * @return 受影响的行数
+     */
+    Integer reviewIn(Map<String,Object> map,Integer userId,UserByPort userToken,String userAgent);
+
+
 
 
 
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java
index 82b905d2..158943f4 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java
@@ -4,10 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.dreamchaser.depository_manage.entity.*;
 import com.dreamchaser.depository_manage.exception.MyException;
 import com.dreamchaser.depository_manage.mapper.*;
-import com.dreamchaser.depository_manage.pojo.GroupInfoP;
-import com.dreamchaser.depository_manage.pojo.MaterialAndPlaceForView;
-import com.dreamchaser.depository_manage.pojo.ResultForGroupReturn;
-import com.dreamchaser.depository_manage.pojo.RoleAndDepository;
+import com.dreamchaser.depository_manage.pojo.*;
 import com.dreamchaser.depository_manage.service.DepositoryRecordService;
 import com.dreamchaser.depository_manage.service.GroupService;
 import com.dreamchaser.depository_manage.service.SplitUnitService;
@@ -1076,6 +1073,19 @@ public class GroupServiceImpl implements GroupService {
         return groupInfoByGid;
     }
 
+    /**
+     * 入库审核申请
+     * @param map 仓库调度信息
+     * @return 受影响的行数
+     */
+    @Override
+    public Integer reviewIn(Map<String, Object> map, Integer userId, UserByPort userToken, String userAgent) {
+        Object id = map.get("id"); // 主订单编号
+        // 获取当前主订单
+        ApplicationInRecordP mainRecordP = depositoryRecordMapper.findApplicationInRecordPById(ObjectFormatUtil.toInteger(id));
+        return null;
+    }
+
     /**
      * 构造树形组件数据模板
      *
diff --git a/src/main/resources/templates/pages/application/form-step-look_group_review.html b/src/main/resources/templates/pages/application/form-step-look_group_review.html
index 62c849d4..f204cb2d 100644
--- a/src/main/resources/templates/pages/application/form-step-look_group_review.html
+++ b/src/main/resources/templates/pages/application/form-step-look_group_review.html
@@ -42,6 +42,8 @@
                 <legend>组合入库</legend>
                 <div class="layui-fluid">
                     <div class="layui-card">
+                        <input style="display:none;" th:value="${record.getId()}" id="id">
+
                         <form class="layui-form"
                               style="margin: 0 auto;max-width: 700px;"
                               lay-filter="form1" id="form1">
@@ -174,14 +176,98 @@
                                 </div>
                             </fieldset>
                         </form>
+
+                        <div id="review">
+                            <div class="layui-form" style="margin: 0 auto;max-width: 700px;padding-top: 40px;">
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">审核备注:</label>
+                                    <div class="layui-input-block">
+                                        <input id="approverMessage" name="approverMessage"
+                                               placeholder="请填写相关原因及申请原因" value="" class="layui-input"/>
+                                    </div>
+                                </div>
+
+                                <div class="layui-row layui-col-space15">
+                                    <div class="layui-input-block">
+                                        <div class="layui-col-xs12 layui-col-md3" style="padding: 7.5px">
+                                            <button type="button" class="layui-btn" onclick="review(1)">
+                                                &emsp;同意&emsp;
+                                            </button>
+                                        </div>
+                                        <div class="layui-col-xs12 layui-col-md3" style="padding: 7.5px">
+                                            <button type="button" class="layui-btn layui-btn-danger"
+                                                    onclick="review(2)">
+                                                &emsp;驳回&emsp;
+                                            </button>
+                                        </div>
+
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </fieldset>
+
         </div>
     </div>
 </div>
 <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
 <script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script>
+<script>
+    function review() {
+    }
+    layui.use(['form', 'table', 'laydate'], function () {
+        var $ = layui.jquery;
+        review = function (pass) {
+            let data = {};
+            data.id = $("#id").val();
+            if (pass === 1) {
+                data.approverPass = 1;
+            } else {
+                data.approverPass = 2;
+            }
+            data.approverMessage = $("#approverMessage").val();
+            send(data);
+        };
+
+        function send(req) {
+            $.ajax({
+                url: "/group/reviewIn",
+                type: 'put',
+                dataType: 'json',
+                contentType: "application/json;charset=utf-8",
+                data: JSON.stringify(req),
+                beforeSend: function () {
+                    this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
+                },
+                success: function (data) {
+                    layer.close(this.layerIndex);
+                    if (data.status >= 300) {
+                        layer.msg(data.statusInfo.detail,
+                            {
+                                icon: 2,
+                                time: 300
+                            },
+                            function () {
+                                window.location = '/form_step_look?id=' + req.id;
+                            });//失败的表情
+
+                        return;
+                    } else {
+                        layer.msg("提交成功", {
+                            icon: 6,//成功的表情
+                            time: 500 //1秒关闭（如果不配置，默认是3秒）
+                        }, function () {
+                            window.location = '/form_step_look?id=' + req.id;
+                        });
+                    }
+                },
+            })
+        }
+
+    })
+</script>
 
 </body>
 
diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
index 6ec74998..6a68b6ef 100644
--- a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
+++ b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
@@ -325,7 +325,7 @@
     <select id="findMyTaskIn" resultMap="simpleApplicationInRecordMap" parameterType="map">
         SELECT
         <include refid="simpleApplicationIn"/>
-        FROM applicationinrecordinfo WHERE 1=1 and airapproverPass != 4
+        FROM applicationinrecordinfo WHERE 1=1 and airapproverPass != 4 and airtoGroupId is null
         <if test='isDone == "0"'>
             and (FIND_IN_SET(#{userId},airapproverId) != 0 and airapproverPass = 3)
         </if>
@@ -341,7 +341,7 @@
     <select id="findMyTaskInCount" resultType="int" parameterType="map">
         SELECT
         count(*)
-        FROM applicationinrecordinfo WHERE 1=1 and airapproverPass != 4
+        FROM applicationinrecordinfo WHERE 1=1 and airapproverPass != 4 and airtoGroupId is null
         <if test='isDone == "0"'>
             and (FIND_IN_SET(#{userId},airapproverId) != 0 and airapproverPass = 3)
         </if>