修改入库记录删除部分bug

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

@@ -2100,7 +2100,6 @@ public class PageController {
         UserByPort userToken = (UserByPort) request.getAttribute("userToken");
         String url = PortConfig.external_url + "/org/positionlist";
         ModelAndView mv = new ModelAndView();
-        mv.setViewName("pages/post/post-out");
         mv.addObject("parentId", organization);
         if (organization != null) {
             Map<String, Object> map = new HashMap<>();

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

@@ -4053,7 +4053,10 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
         new Thread(new Runnable() {
             @Override
             public void run() {
-                updateInventoryForErrorInRecord(record.getMid(), record.getQuantity(), record.getAirUnit(), record.getPlaceId(), record.getDepositoryId());
+                if (Integer.compare(record.getAirapproverPass(), 4) == 0 || Integer.compare(record.getAirapproverPass(), 1) == 0) {
+                    // 如果已经入库
+                    updateInventoryForErrorInRecord(record.getMid(), record.getQuantity(), record.getAirUnit(), record.getPlaceId(), record.getDepositoryId());
+                }
             }
         }).start();
         return depositoryRecordMapper.deleteApplicationInRecordById(id);
@@ -4073,7 +4076,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
             public void run() {
                 for (ApplicationInRecordP record : applicationInRecordsByIds
                 ) {
-                    updateInventoryForErrorInRecord(record.getMid(), record.getQuantity(), record.getAirUnit(), record.getPlaceId(), record.getDepositoryId());
+                    if (Integer.compare(record.getAirapproverPass(), 4) == 0 || Integer.compare(record.getAirapproverPass(), 1) == 0) {
+                        updateInventoryForErrorInRecord(record.getMid(), record.getQuantity(), record.getAirUnit(), record.getPlaceId(), record.getDepositoryId());
+                    }
                 }
             }
         }).start();

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

@@ -34,6 +34,10 @@
                                     <td>物料名称</td>
                                     <td id="materialName" th:text="${record.getMname()}">骁龙888芯片</td>
                                 </tr>
+                                <tr>
+                                    <td>物料型号</td>
+                                    <td id="version" th:text="${record.getMversion()}">骁龙888芯片</td>
+                                </tr>
                                 <tr>
                                     <td>存货编码</td>
                                     <td id="mcode" th:text="${record.getMcode()}">外芯仓库</td>
@@ -46,10 +50,6 @@
                                     <td>数量</td>
                                     <td id="quantity" th:text="${record.getQuantity()}">409</td>
                                 </tr>
-                                <tr>
-                                    <td>金额</td>
-                                    <td id="price" th:text="${record.getPrice()}">2016-11-28</td>
-                                </tr>
                                 <tr>
                                     <td>仓库名称</td>
                                     <td id="depositoryName" th:text="${record.getDepositoryName()}">外芯仓库</td>

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

@@ -35,6 +35,10 @@
                                     <td>物料名称</td>
                                     <td id="materialName" th:text="${record.getMname()}">骁龙888芯片</td>
                                 </tr>
+                                <tr>
+                                    <td>物料型号</td>
+                                    <td id="version" th:text="${record.getMversion()}">骁龙888芯片</td>
+                                </tr>
                                 <tr>
                                     <td>存货编码</td>
                                     <td id="mcode" th:text="${record.getMcode()}">外芯仓库</td>
@@ -47,10 +51,6 @@
                                     <td>数量</td>
                                     <td id="quantity" th:text="${record.getQuantity()}">409</td>
                                 </tr>
-                                <tr>
-                                    <td>金额</td>
-                                    <td id="price" th:text="${record.getPrice()}">2016-11-28</td>
-                                </tr>
                                 <tr>
                                     <td>仓库名称</td>
                                     <td id="depositoryName" th:text="${record.getDepositoryName()}">外芯仓库</td>

src/main/resources/templates/pages/post/post-out.html

@@ -57,7 +57,7 @@
             <a class="layui-btn layui-btn-normal layui-btn-xs data-count-subclass" lay-event="subclass">子类别</a>
             <a class="layui-btn  layui-btn-xs data-count-edit" lay-event="detail">详情</a>
             <a class="layui-btn  layui-btn-xs data-count-edit" lay-event="add_role">设置权限</a>
-            <a class="layui-btn  layui-btn-xs data-count-edit" lay-event="addRoleIn">入库审核权</a>
+            <a class="layui-btn  layui-btn-xs layui-btn-warm" lay-event="addRoleIn">入库审核权</a>
         </script>
 
     </div>

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

@@ -34,6 +34,10 @@
                                     <td>物料名称</td>
                                     <td id="materialName" th:text="${record.getMname()}">骁龙888芯片</td>
                                 </tr>
+                                <tr>
+                                    <td>物料型号</td>
+                                    <td id="version" th:text="${record.getMversion()}">骁龙888芯片</td>
+                                </tr>
                                 <tr>
                                     <td>存货编码</td>
                                     <td id="mcode" th:text="${record.getMcode()}">外芯仓库</td>
@@ -46,10 +50,6 @@
                                     <td>数量</td>
                                     <td id="quantity" th:text="${record.getQuantity()}">409</td>
                                 </tr>
-                                <tr>
-                                    <td>金额</td>
-                                    <td id="price" th:text="${record.getPrice()}">2016-11-28</td>
-                                </tr>
                                 <tr>
                                     <td>仓库名称</td>
                                     <td id="depositoryName" th:text="${record.getDepositoryName()}">外芯仓库</td>

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

@@ -35,6 +35,10 @@
                                     <td>物料名称</td>
                                     <td id="materialName" th:text="${record.getMname()}">骁龙888芯片</td>
                                 </tr>
+                                <tr>
+                                    <td>物料型号</td>
+                                    <td id="version" th:text="${record.getMversion()}">骁龙888芯片</td>
+                                </tr>
                                 <tr>
                                     <td>存货编码</td>
                                     <td id="mcode" th:text="${record.getMcode()}">外芯仓库</td>
@@ -47,10 +51,6 @@
                                     <td>数量</td>
                                     <td id="quantity" th:text="${record.getQuantity()}">409</td>
                                 </tr>
-                                <tr>
-                                    <td>金额</td>
-                                    <td id="price" th:text="${record.getPrice()}">2016-11-28</td>
-                                </tr>
                                 <tr>
                                     <td>仓库名称</td>
                                     <td id="depositoryName" th:text="${record.getDepositoryName()}">外芯仓库</td>

target/classes/templates/pages/post/post-out.html

@@ -57,7 +57,7 @@
             <a class="layui-btn layui-btn-normal layui-btn-xs data-count-subclass" lay-event="subclass">子类别</a>
             <a class="layui-btn  layui-btn-xs data-count-edit" lay-event="detail">详情</a>
             <a class="layui-btn  layui-btn-xs data-count-edit" lay-event="add_role">设置权限</a>
-            <a class="layui-btn  layui-btn-xs data-count-edit" lay-event="addRoleIn">入库审核权</a>
+            <a class="layui-btn  layui-btn-xs layui-btn-warm" lay-event="addRoleIn">入库审核权</a>
         </script>
 
     </div>