From b894abda4685047b27398dcf2c4e25bf4a44b081 Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Wed, 29 Mar 2023 13:23:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=87=BA=E5=BA=93=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DepositoryRecordController.java           |  40 ++-
 .../controller/PageController.java            |  22 +-
 .../depository_manage/entity/ExcelInfo.java   |   6 +
 .../service/DepositoryRecordService.java      |   6 +
 .../impl/DepositoryRecordServiceImpl.java     | 250 ++++++++++++++----
 .../service/impl/ExcelServiceImpl.java        |   1 +
 .../service/impl/SplitUnitServiceImpl.java    |   3 +-
 .../depository_manage/utils/DateUtil.java     |  21 ++
 .../static/upload/materialImport.xlsx         | Bin 9408 -> 9429 bytes
 .../application/form-step-look_back.html      |   2 +
 .../form-step-look_minRecordOut.html          | 190 ++++++++++++-
 .../depository_manage/TestForOther.java       |  17 +-
 .../classes/static/upload/materialImport.xlsx | Bin 9408 -> 9429 bytes
 .../application/application-out_min.html      |   6 -
 .../application/form-step-look_back.html      |   2 +
 .../form-step-look_minRecordOut.html          | 190 ++++++++++++-
 .../templates/pages/company/company-out.html  |  18 +-
 .../templates/pages/post/post-out.html        |  19 +-
 18 files changed, 690 insertions(+), 103 deletions(-)

diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
index b0c85ad2..08298839 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
@@ -900,7 +900,7 @@ public class DepositoryRecordController {
             redisTemplateForHash.opsForList().remove("depositoryIds" + userToken.getId(), 1, depositoryId.toString());
         }
         for (String placeCode : placeCodes) {
-            redisTemplateForHash.opsForList().remove("placeCodes" + userToken.getId(), 1, placeCode+" ");
+            redisTemplateForHash.opsForList().remove("placeCodes" + userToken.getId(), 1, placeCode + " ");
         }
         return CrudUtil.insertHandle(1, 1);
     }
@@ -1565,5 +1565,43 @@ public class DepositoryRecordController {
         }
     }
 
+    // 用于获取当前出库子单下物料详细信息
+    @PostMapping("/getOutMinRecordMaterialInfo")
+    public RestResponse getOutMinRecordMaterialInfo(@RequestBody Map<String, Object> params) {
+        Inventory inventory = null;
+        if (params.containsKey("id")) {
+            // 获取子单详情
+            ApplicationOutRecordMinP outRecordMinP = depositoryRecordService.findApplicationOutMinById(ObjectFormatUtil.toInteger(params.get("id")));
+            inventory = materialService.findInventoryById(outRecordMinP.getMid());
+            List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(inventory.getMid());
+            inventory.setSplitInfoList(splitInfoByMid);
+        }
+        return new RestResponse(inventory);
+    }
+
+    /**
+     * 用于修改当前出库的子订单信息
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping("/editOutMinRecordInfo")
+    public RestResponse editOutMinRecordInfo(@RequestBody Map<String, Object> map, HttpServletRequest request) {
+        if (map.containsKey("id")) {
+            String token = request.getHeader("user-token");
+            if (token == null) {
+                token = (String) request.getSession().getAttribute("userToken");
+            }
+            UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
+            String header = request.getHeader("user-agent");
+            String crypt = Md5.crypt(header);
+
+            Integer integer = depositoryRecordService.updateOutMinRecordInfo(map, userToken, crypt);
+            return CrudUtil.updateHandle(integer,1);
+        } else {
+            throw new MyException("缺少必要参数");
+        }
+    }
+
 
 }
diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
index b99e9811..db18961e 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
@@ -1636,7 +1636,9 @@ public class PageController {
                 int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1);
                 sumUnit.append(unit).append(",");
                 if (inventoryById.getPrice() != null) {
-                    sumPrice += (inventoryById.getPrice() / scale * applicationOutRecordMin.getQuantity());
+                    BigDecimal bd = BigDecimal.valueOf((inventoryById.getPrice() / scale * applicationOutRecordMin.getQuantity()));
+                    double v = bd.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+                    sumPrice += v;
                 } else {
                     sumPrice += 0;
                 }
@@ -1898,6 +1900,24 @@ public class PageController {
                 Depository depositoryById = depositoryService.findDepositoryById(transferRecord.getToId());
                 mv.addObject("toLocation", depositoryById.getDname() + "-" + place.getCode());
             }
+
+
+            // 获取当前主单
+            ApplicationOutRecordP recordP = depositoryRecordService.findApplicationOutRecordPById(recordMinP.getParentId());
+            boolean b = DateUtil.IsMonthStartAndEnd(recordP.getApplicantTime());
+            Integer role = userToken.getIsadmin();
+            if(role == null){
+                role = 1;
+            }
+            if (Integer.compare(userToken.getMaindeparment(), 361) == 0 || Integer.compare(role, 4) == 0  && b) {
+                mv.addObject("edisplay", "inline-block");
+            }else{
+                mv.addObject("edisplay", "none");
+
+            }
+
+
+
             mv.addObject("recordMinP", recordMinP);
         } else {
             throw new MyException("缺少必要参数！");
diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/ExcelInfo.java b/src/main/java/com/dreamchaser/depository_manage/entity/ExcelInfo.java
index fad6b0bf..35285590 100644
--- a/src/main/java/com/dreamchaser/depository_manage/entity/ExcelInfo.java
+++ b/src/main/java/com/dreamchaser/depository_manage/entity/ExcelInfo.java
@@ -55,4 +55,10 @@ public class ExcelInfo {
     /** 材质 */
     @ExcelProperty("材质")
     private String texture;
+
+    /**
+     * 品牌
+     */
+    @ExcelProperty("品牌")
+    private String brand;
 }
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/DepositoryRecordService.java b/src/main/java/com/dreamchaser/depository_manage/service/DepositoryRecordService.java
index 7455914f..8d7e77cf 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/DepositoryRecordService.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/DepositoryRecordService.java
@@ -557,4 +557,10 @@ public interface DepositoryRecordService {
      */
     RestResponse updateOutSplitInventoryInfo(SplitInfo splitInfo, MaterialAndPlace materialAndPlace, double quantity, double nowQuantity, SplitInfo realSplitInfo);
 
+    /**
+     * 用于修改出库子记录
+     * @param map 待修改数据
+     * @return
+     */
+    Integer updateOutMinRecordInfo(Map<String,Object> map,UserByPort userToken,String userAgent);
 }
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
index 3ee23256..60585175 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
@@ -722,7 +722,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                 flagForApproval = false;
             }
         }
-        if(map.containsKey("isGroup")){
+        if (map.containsKey("isGroup")) {
             flagForApproval = isApprovalPass;
         }
         map.put("flagForApproval", flagForApproval);
@@ -1120,14 +1120,12 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                         }
                     }
                 }).start();
-            }
-            else {
+            } else {
                 restResponse.setStatus(508);
                 restResponse.setData("");
                 restResponse.setStatusInfo(new StatusInfo("出库失败", "出库失败，库存不足"));
             }
-        }
-        else {
+        } else {
             // 如果是拆单后的出库
 
             // 用于获取对应的拆单记录
@@ -1191,8 +1189,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                     restResponse.setStatusInfo(new StatusInfo("出库成功", "出库成功"));
 
 
-                }
-                else {
+                } else {
                     // 如果不能满足需求
 
                     // 获取对应的拆单记录
@@ -1218,7 +1215,6 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                         splitUnitMapper.updateSplitInventory(splitInventory);
 
 
-
                         // 获取当前父级拆单记录
                         SplitInfo parentSplitInfo = splitUnitMapper.findSplitInfoById(splitInfoById.getParentId());
 
@@ -1235,17 +1231,16 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                                 map.put("unit", applicationOutMinById.getUnit());
                                 transferMaterial(map);
                             }
-                        }else{
+                        } else {
                             trueOut = 0.0;
-                            splitInventory.setSaveQuantity((int)(oldSplitInventory * 100));
-                            splitInventory.setOutQuantity(splitInventory.getOutQuantity() - (int)(oldSplitInventory * 100));
+                            splitInventory.setSaveQuantity((int) (oldSplitInventory * 100));
+                            splitInventory.setOutQuantity(splitInventory.getOutQuantity() - (int) (oldSplitInventory * 100));
                             // 修改库存数量
                             splitUnitMapper.updateSplitInventory(splitInventory);
                         }
 
                         updateApplicationMinOutInfo(id, applicationOutMinById, record, trueOut, userByPort, placeId, userAgent);
-                    }
-                    else {
+                    } else {
                         // 如果当前拆单没有父级
 
 
@@ -1330,8 +1325,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                                 restResponse.setData("");
                                 restResponse.setStatusInfo(new StatusInfo("出库失败", "出库失败，库存不足"));
                             }
-                        }
-                        else {
+                        } else {
                             // 如果大于
 
                             // 获取库存重要减少的数量
@@ -1365,8 +1359,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                                     // 如果当前库存中的物料库存不足以出库
                                     flag = false;
                                 }
-                            }
-                            else {
+                            } else {
                                 restResponse.setStatus(566);
                                 restResponse.setData("");
                                 restResponse.setStatusInfo(new StatusInfo("出库失败", "当前位置未发现该物料"));
@@ -1420,8 +1413,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                     }
                 }
 
-            }
-            else {
+            } else {
                 // 如果拆单库存处理记录不存在
 
                 int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1);
@@ -1489,8 +1481,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                     restResponse.setStatusInfo(new StatusInfo("出库成功", "出库成功"));
 
 
-                }
-                else {
+                } else {
                     restResponse.setStatus(508);
                     restResponse.setData("");
                     restResponse.setStatusInfo(new StatusInfo("出库失败", "出库失败，库存不足"));
@@ -1546,8 +1537,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
             restResponse.setStatus(200);
             restResponse.setData("");
             restResponse.setStatusInfo(new StatusInfo("出库成功", "出库成功"));
-        }
-        else {
+        } else {
 
             // 如果当前库存拆单记录的库存不能满足需要
 
@@ -1621,8 +1611,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                         restResponse.setData("");
                         restResponse.setStatusInfo(new StatusInfo("出库成功", "出库成功"));
 
-                    }
-                    else {
+                    } else {
                         // 如果当前当前父级与其的库存数量不大于要出库的数量
 
                         if (parentSplitInfo.getParentId() != null) {
@@ -1671,8 +1660,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                             } else {
                                 return restResponse1;
                             }
-                        }
-                        else {
+                        } else {
                             // 如果没有父级
 
                             // 获取当前拆单单位与顶级之间的进制
@@ -1701,8 +1689,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                                 placeMapper.updateMaterialAndPlace(materialAndPlace);
 
 
-                            }
-                            else {
+                            } else {
                                 // 如果不可出库
                                 restResponse.setStatus(508);
                                 restResponse.setData("");
@@ -1711,8 +1698,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
 
                         }
                     }
-                }
-                else {
+                } else {
                     // 如果已经没有父级
 
                     // 获取基础单位与当前实际出库单位单位之间的进制
@@ -1723,23 +1709,23 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                     // 获取对应的库存
                     Inventory inventory = materialMapper.findInventoryById(materialAndPlace.getMid());
 
-                    if(surplus_redundant == 0) {
+                    if (surplus_redundant == 0) {
                         surplus_redundant = 1;
                     }
-                        // 设置当前库存数量
-                        materialAndPlace.setQuantity(materialAndPlace.getQuantity() - surplus_redundant * 100);
-                        inventory.setQuantity(inventory.getQuantity() - surplus_redundant * 100);
+                    // 设置当前库存数量
+                    materialAndPlace.setQuantity(materialAndPlace.getQuantity() - surplus_redundant * 100);
+                    inventory.setQuantity(inventory.getQuantity() - surplus_redundant * 100);
 
 
                     // 修改库存数量
                     materialMapper.updateInventory(inventory);
                     placeMapper.updateMaterialAndPlace(materialAndPlace);
 
-                    Map<String,Object> insertForOut = new HashMap<>();
-                    insertForOut.put("unit",realSplitInfo.getNewUnit());
-                    insertForOut.put("quantity",surplus_redundant * splitInfoScaleQuantityForAll - nowQuantity);
-                    insertForOut.put("placeId",materialAndPlace.getPid());
-                    insertForOut.put("depositoryId",materialAndPlace.getDid());
+                    Map<String, Object> insertForOut = new HashMap<>();
+                    insertForOut.put("unit", realSplitInfo.getNewUnit());
+                    insertForOut.put("quantity", surplus_redundant * splitInfoScaleQuantityForAll - nowQuantity);
+                    insertForOut.put("placeId", materialAndPlace.getPid());
+                    insertForOut.put("depositoryId", materialAndPlace.getDid());
                     insertForOut.put("mid", inventory.getMid());
                     insertForOut.put("mcode", inventory.getCode());
                     insertForOut.put("type", "in");
@@ -1751,8 +1737,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
 
                     restResponse.setData(surplus_redundant);
                 }
-            }
-            else {
+            } else {
                 // 如果不能满足需求
 
                 restResponse.setStatus(508);
@@ -1763,6 +1748,167 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
         return restResponse;
     }
 
+    /**
+     * 用于修改出库子记录
+     *
+     * @param map 待修改数据
+     * @return
+     */
+    @Override
+    public Integer updateOutMinRecordInfo(Map<String, Object> map, UserByPort userToken, String userAgent) {
+        Integer result = 0;
+
+        Integer id = ObjectFormatUtil.toInteger(map.get("id"));
+        // 获取更改的数量
+        Double quantity = ObjectFormatUtil.toDouble(map.get("quantity"));
+
+        // 获取出库子记录信息
+        ApplicationOutRecordMin outRecordMin = depositoryRecordMapper.findApplicationOutMinById(id);
+        // 获取出库主记录
+        ApplicationOutRecord outRecord = depositoryRecordMapper.findApplicationOutRecordPById(outRecordMin.getParentId());
+
+        // 获取已出库的数量
+        Integer trueOut = outRecordMin.getTrueOut();
+        // 获取要出库的数量
+        Integer outQuantity = outRecordMin.getQuantity();
+
+
+        // 获取出库的单位
+        String unit = outRecordMin.getUnit();
+
+        // 获取库存记录
+        Inventory inventoryById = materialMapper.findInventoryById(outRecordMin.getMid());
+        if (Integer.compare(trueOut, 0) != 0) {
+            // 如果是开始出库的
+
+            if (trueOut >= (int) (quantity * 100)) {
+                // 如果已经出库的数量大于要修改的数量
+
+                // 如果已经完成了出库
+
+                // 获取要退库的数量
+                double returnQuantity = (double) (trueOut / 100) - quantity;
+
+
+                // 获取出库库位
+                Place placeById = placeMapper.findPlaceById(outRecordMin.getPlaceId());
+
+                // 用于获取映射关系
+                Map<String, Object> paramForPlaceAndMaterial = new HashMap<>();
+                paramForPlaceAndMaterial.put("mid", placeById.getId());
+                paramForPlaceAndMaterial.put("iid", inventoryById.getId());
+                // 获取库存与库存之间的映射
+                MaterialAndPlace placeAndMaterialByMidAndPid = placeMapper.findPlaceAndMaterialByMidAndPid(paramForPlaceAndMaterial);
+
+
+                if ("-1".equals(unit)) {
+                    // 如果是基础单位
+
+
+                    // 设置库存数量
+                    inventoryById.setQuantity(inventoryById.getQuantity() + (int) (returnQuantity * 100));
+                    // 设置库位数量
+                    placeById.setQuantity(placeById.getQuantity() + (int) (returnQuantity * 100));
+                    // 设置新映射数量
+                    placeAndMaterialByMidAndPid.setQuantity(placeAndMaterialByMidAndPid.getQuantity() + (int) (returnQuantity * 100));
+                    // 修改
+                    materialMapper.updateInventory(inventoryById);
+                    placeMapper.updateMaterialAndPlace(placeAndMaterialByMidAndPid);
+                    placeMapper.UpdatePlace(placeById);
+                } else {
+                    // 如果是拆单
+
+                    Map<String, Object> paramForSplitInfo = new HashMap<>();
+                    paramForSplitInfo.put("mid", inventoryById.getMid());
+                    paramForSplitInfo.put("newUnit", unit);
+                    // 获取拆单记录
+                    SplitInfo splitInfo = splitUnitMapper.findSplitInfoByMidAndUnit(paramForSplitInfo);
+
+                    Map<String, Object> paramForSplitInventory = new HashMap<>();
+                    paramForSplitInventory.put("sid", splitInfo.getId());
+                    paramForSplitInventory.put("iid", placeAndMaterialByMidAndPid.getId());
+                    // 获取拆单库存记录
+                    SplitInventory splitInventory = splitUnitMapper.findSplitInventoryByIidAndSid(paramForSplitInventory);
+
+                    Map<String, Object> paramForUpdateSplitInventory = new HashMap<>();
+                    paramForUpdateSplitInventory.put("placeId", outRecordMin.getPlaceId());
+                    paramForUpdateSplitInventory.put("depositoryId", outRecordMin.getDepositoryId());
+                    paramForUpdateSplitInventory.put("quantity", returnQuantity);
+                    paramForUpdateSplitInventory.put("mid", inventoryById.getMid());
+                    paramForUpdateSplitInventory.put("unit", unit);
+                    result = splitUnitService.realInInventoryToDepository(returnQuantity, splitInventory, paramForUpdateSplitInventory, splitInfo, placeAndMaterialByMidAndPid, false);
+                    if (paramForUpdateSplitInventory.containsKey("applicationInId")) {
+                        depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(paramForUpdateSplitInventory.get("applicationInId")));
+                    }
+                }
+
+
+                // 修改子单数据
+                outRecordMin.setQuantity((int) (quantity * 100));
+                outRecordMin.setTrueOut((int) (quantity * 100));
+                depositoryRecordMapper.updateApplicationOutRecordMin(outRecordMin);
+
+                if (Integer.compare(trueOut, outQuantity) != 0) {
+                    //如果没有完成出库
+
+                    // 强行完成出库
+
+                    updateApplicationMinOutInfo(id, outRecordMin, outRecord, (double) (quantity / 100), userToken, placeById.getId(), userAgent);
+
+                }
+
+
+            } else {
+                // 如果不大于
+                // 设置新数量
+                outRecordMin.setQuantity((int) (quantity * 100));
+                // 修改记录
+                result = depositoryRecordMapper.updateApplicationOutRecordMin(outRecordMin);
+            }
+
+        } else {
+            // 如果未开始出库的
+
+            // 设置新数量
+            outRecordMin.setQuantity((int) (quantity * 100));
+            // 修改记录
+            result = depositoryRecordMapper.updateApplicationOutRecordMin(outRecordMin);
+        }
+
+        // 修改主记录的出库数量
+        outRecord.setQuantity(outRecord.getQuantity() - outQuantity + (int) (quantity * 100));
+        if ("-1".equals(unit)) {
+            // 如果是基础单位
+            if (inventoryById.getPrice() != null) {
+                outRecord.setPrice(outRecord.getPrice() - inventoryById.getPrice() * (outQuantity / 100) + inventoryById.getPrice() * quantity);
+            }
+
+        } else {
+            // 如果是拆单单位
+
+            if (inventoryById.getPrice() != null) {
+                Map<String, Object> paramForSplitInfo = new HashMap<>();
+                paramForSplitInfo.put("mid", inventoryById.getMid());
+                paramForSplitInfo.put("newUnit", unit);
+                // 获取拆单记录
+                SplitInfo splitInfo = splitUnitMapper.findSplitInfoByMidAndUnit(paramForSplitInfo);
+
+                // 获取当前拆单单位与基础单位的进制
+                int splitInfoScaleQuantity = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1);
+
+                double newPrice = inventoryById.getPrice() / splitInfoScaleQuantity;
+                BigDecimal bg = new BigDecimal(newPrice);
+                newPrice = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+
+                outRecord.setPrice(outRecord.getPrice() - (newPrice  * (outQuantity / 100) ) + newPrice * quantity);
+            }
+
+
+
+        }
+        return result;
+    }
+
     /**
      * 用于完成出库时的相关处理操作
      *
@@ -2007,7 +2153,6 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                         }
 
 
-
                         //设置子订单在redis中的主键
                         String minRecordKey = "minRecord:" + applicationOutRecordMin.getId();
                         // 将子订单主键插入到主订单的子订单列表
@@ -2072,8 +2217,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                                     JSONObject jsonObject = qyWxOperationService.sendNotificationToDepositoryManager(QyWxUid.toString(), applicationOutRecordMin.getId(), userAgent);
                                 }
                             }).start();
-                        }
-                        else{
+                        } else {
                             // 如果是通过仓库
 
 
@@ -2127,7 +2271,6 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                         }
 
 
-
                     }
 
                     // 将主订单插入到redis中
@@ -2158,8 +2301,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                 // 将当前redis中存储的spno删除
                 redisTemplate.delete(spNo);
             }
-        }
-        else {
+        } else {
             // 如果是部门负责人
 
             String departmentheadTime = recordP.getDepartmentheadTime();
@@ -2535,7 +2677,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
         UserByPort applicantUser = LinkInterfaceUtil.FindUserById(record.getApplicantId(), userToken);
 
 
-        if (map.containsKey("departmentheadPass") && !flagForHasOtherDepository && Integer.compare(applicantUser.getMaindeparment(),361) != 0) {
+        if (map.containsKey("departmentheadPass") && !flagForHasOtherDepository && Integer.compare(applicantUser.getMaindeparment(), 361) != 0) {
             String result = "";
             String simpleTime = DateUtil.getSimpleTime(new Date());
             map.put("departmentheadTime", DateUtil.DateTimeToTimeStamp(simpleTime));
@@ -2615,8 +2757,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                     qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toInteger(id), s, userAgent, 1);
                 }
             }).start();
-        }
-        else {
+        } else {
             String result = "";
             // 开启线程更改其他用户卡片模板样式
             String simpleTime = DateUtil.getSimpleTime(new Date());
@@ -2672,7 +2813,6 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                     minRecord.put("state", "1"); // 当前子订单状态 1待处理2处理
 
 
-
                     // 获取出库仓库
                     Integer depositoryId = applicationOutRecordMin.getDepositoryId();
                     Depository depositoryById = depositoryMapper.findDepositoryById(depositoryId);
@@ -2736,8 +2876,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                                 JSONObject jsonObject = qyWxOperationService.sendNotificationToDepositoryManager(QyWxUid.toString(), applicationOutRecordMin.getId(), userAgent);
                             }
                         }).start();
-                    }
-                    else{
+                    } else {
                         // 如果是通过仓库
 
 
@@ -2825,8 +2964,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                     map.put("departmentheadPass", 1);
                 }
 
-            }
-            else {
+            } else {
                 updateInventoryForOutRefused(record);
                 result = "驳回";
                 map.put("pass", 2);
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java
index 557f6e5a..edb4236e 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java
@@ -114,6 +114,7 @@ public class ExcelServiceImpl implements ExcelService {
                 param.put("texture", excelVo.getTexture());
                 param.put("materialTypeId", excelVo.getTypeId());
                 param.put("id", excelVo.getId());
+                param.put("brand", excelVo.getBrand());
                 param.put("price", excelVo.getPrice() == null ? "0" : excelVo.getPrice());
                 materialService.insertMaterial(param);
                 success.add(excelVo);
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/SplitUnitServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/SplitUnitServiceImpl.java
index b3734318..fa5c336e 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/SplitUnitServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/SplitUnitServiceImpl.java
@@ -142,7 +142,8 @@ public class SplitUnitServiceImpl implements SplitUnitService {
                     // 查询当前库存是否有该拆单的处理记录
                     splitInventory = splitUnitMapper.findSplitInventoryByIidAndSid(paramForInsertSplitInventory);
                 }
-            } else {
+            }
+            else {
                 Map<String, Object> param = new HashMap<>();
                 param.put("depositoryId", map.get("depositoryId"));
                 param.put("mid", map.get("mid"));
diff --git a/src/main/java/com/dreamchaser/depository_manage/utils/DateUtil.java b/src/main/java/com/dreamchaser/depository_manage/utils/DateUtil.java
index 26f89939..144a7175 100644
--- a/src/main/java/com/dreamchaser/depository_manage/utils/DateUtil.java
+++ b/src/main/java/com/dreamchaser/depository_manage/utils/DateUtil.java
@@ -203,4 +203,25 @@ public class DateUtil {
         return (cal.getTimeInMillis() - System.currentTimeMillis()) / 1000;
     }
 
+
+    /**
+     * 用于判断当前日期是否在当月内
+     * @param time 待查询日期
+     * @return
+     */
+    public static boolean IsMonthStartAndEnd(String time) {
+        // 获取当前年份、月份、日期
+        Calendar cale = null;
+        // 第一天
+        cale = Calendar.getInstance();
+        cale.add(Calendar.MONTH, 0);
+        cale.set(Calendar.DAY_OF_MONTH, 1);
+        Date firstDay = cale.getTime();
+        // 最后一天
+        cale = Calendar.getInstance();
+        cale.add(Calendar.MONTH, 1);
+        cale.set(Calendar.DAY_OF_MONTH, 0);
+        Date lastDay = cale.getTime();
+        return Long.parseLong(time) >= firstDay.getTime() && Long.parseLong(time) <= lastDay.getTime();
+    }
 }
diff --git a/src/main/resources/static/upload/materialImport.xlsx b/src/main/resources/static/upload/materialImport.xlsx
index 2e4ef1598e6dd69e6109f5c7bfd8113b2c63e815..55db48171bfd89e5297ad2bb9df49dcae2656ff8 100644
GIT binary patch
delta 3047
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
ZJBsyRQRX;%aV_v5E=ydD_66*Z>AyJQm*@Zh

delta 3033
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
De0-5>

diff --git a/src/main/resources/templates/pages/application/form-step-look_back.html b/src/main/resources/templates/pages/application/form-step-look_back.html
index b7116ebf..fdf89336 100644
--- a/src/main/resources/templates/pages/application/form-step-look_back.html
+++ b/src/main/resources/templates/pages/application/form-step-look_back.html
@@ -19,6 +19,7 @@
                     <div id="stepForm" lay-filter="stepForm" style="margin: 0 auto;">
                         <div style="margin-top: 30px">
                             <button th:style="'display:'+${display}" onclick="downloadExcel()">下载</button>
+
                             <table id="demo" class="layui-table"
                                    style="margin: 0 auto;max-width: 800px;">
                                 <colgroup>
@@ -137,6 +138,7 @@
     function downloadExcel(){
 
     }
+
     layui.use(['form', 'step'], function () {
         var $ = layui.$,
             form = layui.form,
diff --git a/src/main/resources/templates/pages/application/form-step-look_minRecordOut.html b/src/main/resources/templates/pages/application/form-step-look_minRecordOut.html
index afedd039..df70e1a0 100644
--- a/src/main/resources/templates/pages/application/form-step-look_minRecordOut.html
+++ b/src/main/resources/templates/pages/application/form-step-look_minRecordOut.html
@@ -18,6 +18,8 @@
                 <div class="layui-card-body" style="padding-top: 40px;">
                     <div id="stepForm" lay-filter="stepForm" style="margin: 0 auto;">
                         <div style="margin-top: 30px">
+                            <button th:style="'display:'+${edisplay}" onclick="modifyPage()" id="editInfo">编辑</button>
+                            <input id="id" type="text" th:value="${recordMinP.getId()}" readonly style="display: none">
                             <table id="demo" class="layui-table"
                                    style="margin: 0 auto;max-width: 800px;padding-top: 40px;">
                                 <colgroup>
@@ -28,54 +30,101 @@
                                 <tbody>
                                 <tr>
                                     <td>申请编号</td>
-                                    <td id="applicationId" th:text="${recordMinP.getCode()}">123456</td>
+                                    <td>
+                                        <input id="applicationOutCode" type="text" th:value="${recordMinP.getCode()}"
+                                               readonly style="border-style: none;width: 100%;height: 100%">
+                                    </td>
                                 </tr>
                                 <tr>
                                     <td>物料名称</td>
-                                    <td id="materialName" th:text="${recordMinP.getMname()}">骁龙888芯片</td>
+                                    <td>
+                                        <input id="materialName" type="text" th:value="${recordMinP.getMname()}"
+                                               readonly style="border-style: none;width: 100%;height: 100%">
+                                    </td>
                                 </tr>
                                 <tr>
                                     <td>物料型号</td>
-                                    <td id="version" th:text="${recordMinP.getVersion()}">骁龙888芯片</td>
+                                    <td>
+                                        <input id="version" type="text" th:value="${recordMinP.getVersion()}" readonly
+                                               style="border-style: none;width: 100%;height: 100%">
+                                    </td>
                                 </tr>
                                 <tr>
                                     <td>存货编码</td>
-                                    <td id="mcode" th:text="${recordMinP.getMcode()}">外芯仓库</td>
+                                    <td>
+                                        <input id="mcode" type="text" th:value="${recordMinP.getMcode()}" readonly
+                                               style="border-style: none;width: 100%;height: 100%">
+                                    </td>
                                 </tr>
                                 <tr>
                                     <td>数量</td>
-                                    <td id="quantity" th:text="${recordMinP.getQuantity()}">409</td>
+                                    <td>
+                                        <input id="quantity" type="text" th:value="${recordMinP.getQuantity()}" readonly
+                                               style="border-style: none;width: 100%;height: 100%">
+                                    </td>
                                 </tr>
                                 <tr>
                                     <td>单位</td>
-                                    <td id="unit" th:text="${recordMinP.getUnit()}">409</td>
+                                    <td>
+                                        <select id="unit" name="unit" style="border-style: none; width: 100%;">
+                                            <option th:value="-1" th:text="${recordMinP.getUnit()}"></option>
+                                        </select>
+                                    </td>
                                 </tr>
                                 <tr>
                                     <td>金额</td>
-                                    <td id="price" th:text="${recordMinP.getPrice()}">2016-11-28</td>
+                                    <td>
+                                        <input id="price" type="text" th:value="${recordMinP.getPrice()}" readonly
+                                               style="border-style: none;width: 100%;height: 100%">
+
+                                    </td>
                                 </tr>
                                 <tr>
                                     <td>仓库名称</td>
-                                    <td id="depositoryName" th:text="${recordMinP.getDepositoryName()}">外芯仓库</td>
+                                    <td>
+                                        <input id="depositoryName" type="text"
+                                               th:value="${recordMinP.getDepositoryName()}" readonly
+                                               style="border-style: none;width: 100%;height: 100%">
+                                    </td>
                                 </tr>
                                 <tr>
                                     <td>库位编码</td>
-                                    <td id="placeCode" th:text="${recordMinP.getPlaceCode() =='0000'?'默认库位':recordMinP.getPlaceCode()}">外芯仓库</td>
+                                    <td>
+                                        <input id="placeCode" type="text"
+                                               th:value="${recordMinP.getPlaceCode() =='0000'?'默认库位':recordMinP.getPlaceCode()}"
+                                               readonly style="border-style: none;width: 100%;height: 100%">
+                                    </td>
                                 </tr>
-                                <tr  th:style="'display:'+${display}">
+                                <tr th:style="'display:'+${display}">
                                     <td>转入位置</td>
-                                    <td id="location" th:text="${toLocation}">2016-11-28</td>
+                                    <td>
+                                        <input id="location" type="text" th:value="${toLocation}" readonly
+                                               style="border-style: none;width: 100%;height: 100%">
+                                    </td>
                                 </tr>
 
 
                                 <tr>
                                     <td>出库人员</td>
-                                    <td id="checkerName" th:text="${recordMinP.getCheckerName()}">2016-11-28</td>
+                                    <td>
+                                        <input id="checkerName" type="text" th:value="${recordMinP.getCheckerName()}"
+                                               readonly style="border-style: none;width: 100%;height: 100%">
+
+                                    </td>
                                 </tr>
 
                                 </tbody>
 
                             </table>
+                            <div id="btn_show" style=" margin-top: 20px;position: relative;left: 40%; display:none;">
+                                <button type="button" class="layui-btn layui-btn-primary layui-border-blue"
+                                        onclick="editOutRecord()">确定
+                                </button>
+                                <button type="button" class="layui-btn layui-btn-primary layui-border-red"
+                                        onclick="unEdit()">取消
+                                </button>
+                            </div>
+
                         </div>
                     </div>
                 </div>
@@ -87,6 +136,123 @@
 <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 modifyPage() {
+
+    }
+
+    function unEdit() {
+
+    }
+
+    function editOutRecord() {
+
+    }
+
+    let flagForForm = false;
+
+    layui.use(['form', 'step'], function () {
+        var $ = layui.$,
+            form = layui.form,
+            step = layui.step;
+
+        // 获取实际出库数量
+        let quantity = $("#quantity").val();
+        let unit = $("#unit").text();
+
+        let id = $("#id").val();
+        modifyPage = function () {
+            let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
+            $.ajax({
+                url: "/depositoryRecord/getOutMinRecordMaterialInfo",
+                type: "POST",
+                data: JSON.stringify({"id": id}),
+                dataType: 'json',
+                contentType: "application/json;charset=utf-8",
+                success: function (res) {
+                    let data = res.data;
+                    if (data !== null) {
+                        let quantityItem = $("#quantity");
+                        quantityItem.removeAttr("readonly");
+                        quantityItem.focus();
+                        // let splitInfoList = data["splitInfoList"];
+                        // if (splitInfoList !== null) {
+                        //     let unitItem = $("#unit");
+                        //     unitItem.empty();
+                        //     unitItem.append(new Option(data.unit, "-1"));
+                        //     $.each(splitInfoList, function (index, item) {
+                        //         unitItem.append(new Option(item.newUnit, item.newUnit));
+                        //     });
+                        // }
+                    }
+                    $("#btn_show").show();
+                    $("#editInfo").hide();
+                    layer.close(loading2);
+                }
+            })
+        };
+
+        unEdit = function () {
+            $("#btn_show").hide();
+            $("#editInfo").show();
+            $("#quantity").attr("readonly", "readonly");
+            $("#quantity").val(quantity);
+            // $("#unit").empty();
+            // $("#unit").append(new Option(unit, "-1"))
+        };
+
+        editOutRecord = function () {
+            if (!flagForForm) {
+
+                flagForForm = true;
+                let req = {};
+                req.id = id;
+                let newQuantity = $("#quantity").val();
+                if (Number(newQuantity) >= Number(quantity)) {
+                    layer.msg("请申请！", {
+                        icon: 0,
+                        time: 1000
+                    }, function () {
+                        unEdit();
+                    })
+                } else {
+
+                    req.quantity = newQuantity;
+                    req.unit = $("#unit").val();
+                    $.ajax({
+                        url: "/depositoryRecord/editOutMinRecordInfo",
+                        type: "POST",
+                        data: JSON.stringify(req),
+                        dataType: 'json',
+                        contentType: "application/json;charset=utf-8",
+                        success: function (res) {
+                            if (res.status === 205) {
+                                layer.msg("修改成功", {
+                                    icon: 1,
+                                    time: 1000
+                                }, function () {
+
+                                        var index = parent.layer.getFrameIndex(window.name);
+                                        parent.location.reload(); //刷新父页面
+                                        parent.layer.close(index);
+
+                                })
+                            } else {
+                                layer.msg(res.statusInfo.detail, {
+                                    icon: 5,
+                                    time: 1000
+                                }, function () {
+                                    flagForForm = false;
+                                })
+                            }
+                        }
+                    })
+
+                }
+            }
+        }
+
+
+    })
 </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/test/java/com/dreamchaser/depository_manage/TestForOther.java b/src/test/java/com/dreamchaser/depository_manage/TestForOther.java
index 429b13c3..f6e00811 100644
--- a/src/test/java/com/dreamchaser/depository_manage/TestForOther.java
+++ b/src/test/java/com/dreamchaser/depository_manage/TestForOther.java
@@ -15,6 +15,7 @@ import com.dreamchaser.depository_manage.entity.*;
 import com.dreamchaser.depository_manage.mapper.DepositoryMapper;
 import com.dreamchaser.depository_manage.mapper.DepositoryRecordMapper;
 import com.dreamchaser.depository_manage.mapper.MaterialMapper;
+import com.dreamchaser.depository_manage.pojo.ApplicationOutRecordP;
 import com.dreamchaser.depository_manage.pojo.RestResponse;
 import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo;
 import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details;
@@ -38,6 +39,7 @@ import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Array;
 import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.*;
 
@@ -60,6 +62,9 @@ public class TestForOther {
     @Autowired
     QyWxOperationService qyWxOperationService;
 
+    /**
+     * 获取当月的开始和结束时间
+     */
 
 
     @Test
@@ -68,19 +73,13 @@ public class TestForOther {
 //        ApprovalInfo_Details_Approver approver = new ApprovalInfo_Details_Approver();
 //        approver.setUserId("PangFuZhen");
 //        approvalInfo.setApprover(approver);
-        List<String> a = new ArrayList<String>(Collections.singleton("1"));
-//        depositoryRecordService.reviewByQyWxApprovalOut("5",approvalInfo,"7a0ab47a150869808b24d2f4dbe1bb74","2","202303280016", false,2);
+        ApplicationOutRecordP applicationOutRecordPById = depositoryRecordService.findApplicationOutRecordPById(8);
+        //        depositoryRecordService.reviewByQyWxApprovalOut("5",approvalInfo,"7a0ab47a150869808b24d2f4dbe1bb74","2","202303280016", false,2);
 //        depositoryRecordService.reviewByQyWxApprovalIn("[1]",approvalInfo,"460f46eaefb46bb0c171029f62e2cea6","2","202303220009");
 //        UserByPort userByPort = LinkInterfaceUtil.FindUserById(78, null);
 //        List<String> s = excelService.writeExcelForPrint(2, 4,userByPort);
-
+//        GetMonthStartAndEnd();
     }
 
 
-
-
-
-
-
-
 }
diff --git a/target/classes/static/upload/materialImport.xlsx b/target/classes/static/upload/materialImport.xlsx
index 2e4ef1598e6dd69e6109f5c7bfd8113b2c63e815..55db48171bfd89e5297ad2bb9df49dcae2656ff8 100644
GIT binary patch
delta 3047
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
ZJBsyRQRX;%aV_v5E=ydD_66*Z>AyJQm*@Zh

delta 3033
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
De0-5>

diff --git a/target/classes/templates/pages/application/application-out_min.html b/target/classes/templates/pages/application/application-out_min.html
index 8136662c..c310f18d 100644
--- a/target/classes/templates/pages/application/application-out_min.html
+++ b/target/classes/templates/pages/application/application-out_min.html
@@ -90,12 +90,6 @@
             page: true,
             skin: 'line',
             done: function (res, curr, count) {
-                var data = res.data;
-                if (data.length > 0) {
-                    if (data[0].state === "进行中") {
-                        $("[data-field='id']").css('display', 'none');
-                    }
-                }
 
 
             }
diff --git a/target/classes/templates/pages/application/form-step-look_back.html b/target/classes/templates/pages/application/form-step-look_back.html
index b7116ebf..fdf89336 100644
--- a/target/classes/templates/pages/application/form-step-look_back.html
+++ b/target/classes/templates/pages/application/form-step-look_back.html
@@ -19,6 +19,7 @@
                     <div id="stepForm" lay-filter="stepForm" style="margin: 0 auto;">
                         <div style="margin-top: 30px">
                             <button th:style="'display:'+${display}" onclick="downloadExcel()">下载</button>
+
                             <table id="demo" class="layui-table"
                                    style="margin: 0 auto;max-width: 800px;">
                                 <colgroup>
@@ -137,6 +138,7 @@
     function downloadExcel(){
 
     }
+
     layui.use(['form', 'step'], function () {
         var $ = layui.$,
             form = layui.form,
diff --git a/target/classes/templates/pages/application/form-step-look_minRecordOut.html b/target/classes/templates/pages/application/form-step-look_minRecordOut.html
index afedd039..df70e1a0 100644
--- a/target/classes/templates/pages/application/form-step-look_minRecordOut.html
+++ b/target/classes/templates/pages/application/form-step-look_minRecordOut.html
@@ -18,6 +18,8 @@
                 <div class="layui-card-body" style="padding-top: 40px;">
                     <div id="stepForm" lay-filter="stepForm" style="margin: 0 auto;">
                         <div style="margin-top: 30px">
+                            <button th:style="'display:'+${edisplay}" onclick="modifyPage()" id="editInfo">编辑</button>
+                            <input id="id" type="text" th:value="${recordMinP.getId()}" readonly style="display: none">
                             <table id="demo" class="layui-table"
                                    style="margin: 0 auto;max-width: 800px;padding-top: 40px;">
                                 <colgroup>
@@ -28,54 +30,101 @@
                                 <tbody>
                                 <tr>
                                     <td>申请编号</td>
-                                    <td id="applicationId" th:text="${recordMinP.getCode()}">123456</td>
+                                    <td>
+                                        <input id="applicationOutCode" type="text" th:value="${recordMinP.getCode()}"
+                                               readonly style="border-style: none;width: 100%;height: 100%">
+                                    </td>
                                 </tr>
                                 <tr>
                                     <td>物料名称</td>
-                                    <td id="materialName" th:text="${recordMinP.getMname()}">骁龙888芯片</td>
+                                    <td>
+                                        <input id="materialName" type="text" th:value="${recordMinP.getMname()}"
+                                               readonly style="border-style: none;width: 100%;height: 100%">
+                                    </td>
                                 </tr>
                                 <tr>
                                     <td>物料型号</td>
-                                    <td id="version" th:text="${recordMinP.getVersion()}">骁龙888芯片</td>
+                                    <td>
+                                        <input id="version" type="text" th:value="${recordMinP.getVersion()}" readonly
+                                               style="border-style: none;width: 100%;height: 100%">
+                                    </td>
                                 </tr>
                                 <tr>
                                     <td>存货编码</td>
-                                    <td id="mcode" th:text="${recordMinP.getMcode()}">外芯仓库</td>
+                                    <td>
+                                        <input id="mcode" type="text" th:value="${recordMinP.getMcode()}" readonly
+                                               style="border-style: none;width: 100%;height: 100%">
+                                    </td>
                                 </tr>
                                 <tr>
                                     <td>数量</td>
-                                    <td id="quantity" th:text="${recordMinP.getQuantity()}">409</td>
+                                    <td>
+                                        <input id="quantity" type="text" th:value="${recordMinP.getQuantity()}" readonly
+                                               style="border-style: none;width: 100%;height: 100%">
+                                    </td>
                                 </tr>
                                 <tr>
                                     <td>单位</td>
-                                    <td id="unit" th:text="${recordMinP.getUnit()}">409</td>
+                                    <td>
+                                        <select id="unit" name="unit" style="border-style: none; width: 100%;">
+                                            <option th:value="-1" th:text="${recordMinP.getUnit()}"></option>
+                                        </select>
+                                    </td>
                                 </tr>
                                 <tr>
                                     <td>金额</td>
-                                    <td id="price" th:text="${recordMinP.getPrice()}">2016-11-28</td>
+                                    <td>
+                                        <input id="price" type="text" th:value="${recordMinP.getPrice()}" readonly
+                                               style="border-style: none;width: 100%;height: 100%">
+
+                                    </td>
                                 </tr>
                                 <tr>
                                     <td>仓库名称</td>
-                                    <td id="depositoryName" th:text="${recordMinP.getDepositoryName()}">外芯仓库</td>
+                                    <td>
+                                        <input id="depositoryName" type="text"
+                                               th:value="${recordMinP.getDepositoryName()}" readonly
+                                               style="border-style: none;width: 100%;height: 100%">
+                                    </td>
                                 </tr>
                                 <tr>
                                     <td>库位编码</td>
-                                    <td id="placeCode" th:text="${recordMinP.getPlaceCode() =='0000'?'默认库位':recordMinP.getPlaceCode()}">外芯仓库</td>
+                                    <td>
+                                        <input id="placeCode" type="text"
+                                               th:value="${recordMinP.getPlaceCode() =='0000'?'默认库位':recordMinP.getPlaceCode()}"
+                                               readonly style="border-style: none;width: 100%;height: 100%">
+                                    </td>
                                 </tr>
-                                <tr  th:style="'display:'+${display}">
+                                <tr th:style="'display:'+${display}">
                                     <td>转入位置</td>
-                                    <td id="location" th:text="${toLocation}">2016-11-28</td>
+                                    <td>
+                                        <input id="location" type="text" th:value="${toLocation}" readonly
+                                               style="border-style: none;width: 100%;height: 100%">
+                                    </td>
                                 </tr>
 
 
                                 <tr>
                                     <td>出库人员</td>
-                                    <td id="checkerName" th:text="${recordMinP.getCheckerName()}">2016-11-28</td>
+                                    <td>
+                                        <input id="checkerName" type="text" th:value="${recordMinP.getCheckerName()}"
+                                               readonly style="border-style: none;width: 100%;height: 100%">
+
+                                    </td>
                                 </tr>
 
                                 </tbody>
 
                             </table>
+                            <div id="btn_show" style=" margin-top: 20px;position: relative;left: 40%; display:none;">
+                                <button type="button" class="layui-btn layui-btn-primary layui-border-blue"
+                                        onclick="editOutRecord()">确定
+                                </button>
+                                <button type="button" class="layui-btn layui-btn-primary layui-border-red"
+                                        onclick="unEdit()">取消
+                                </button>
+                            </div>
+
                         </div>
                     </div>
                 </div>
@@ -87,6 +136,123 @@
 <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 modifyPage() {
+
+    }
+
+    function unEdit() {
+
+    }
+
+    function editOutRecord() {
+
+    }
+
+    let flagForForm = false;
+
+    layui.use(['form', 'step'], function () {
+        var $ = layui.$,
+            form = layui.form,
+            step = layui.step;
+
+        // 获取实际出库数量
+        let quantity = $("#quantity").val();
+        let unit = $("#unit").text();
+
+        let id = $("#id").val();
+        modifyPage = function () {
+            let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
+            $.ajax({
+                url: "/depositoryRecord/getOutMinRecordMaterialInfo",
+                type: "POST",
+                data: JSON.stringify({"id": id}),
+                dataType: 'json',
+                contentType: "application/json;charset=utf-8",
+                success: function (res) {
+                    let data = res.data;
+                    if (data !== null) {
+                        let quantityItem = $("#quantity");
+                        quantityItem.removeAttr("readonly");
+                        quantityItem.focus();
+                        // let splitInfoList = data["splitInfoList"];
+                        // if (splitInfoList !== null) {
+                        //     let unitItem = $("#unit");
+                        //     unitItem.empty();
+                        //     unitItem.append(new Option(data.unit, "-1"));
+                        //     $.each(splitInfoList, function (index, item) {
+                        //         unitItem.append(new Option(item.newUnit, item.newUnit));
+                        //     });
+                        // }
+                    }
+                    $("#btn_show").show();
+                    $("#editInfo").hide();
+                    layer.close(loading2);
+                }
+            })
+        };
+
+        unEdit = function () {
+            $("#btn_show").hide();
+            $("#editInfo").show();
+            $("#quantity").attr("readonly", "readonly");
+            $("#quantity").val(quantity);
+            // $("#unit").empty();
+            // $("#unit").append(new Option(unit, "-1"))
+        };
+
+        editOutRecord = function () {
+            if (!flagForForm) {
+
+                flagForForm = true;
+                let req = {};
+                req.id = id;
+                let newQuantity = $("#quantity").val();
+                if (Number(newQuantity) >= Number(quantity)) {
+                    layer.msg("请申请！", {
+                        icon: 0,
+                        time: 1000
+                    }, function () {
+                        unEdit();
+                    })
+                } else {
+
+                    req.quantity = newQuantity;
+                    req.unit = $("#unit").val();
+                    $.ajax({
+                        url: "/depositoryRecord/editOutMinRecordInfo",
+                        type: "POST",
+                        data: JSON.stringify(req),
+                        dataType: 'json',
+                        contentType: "application/json;charset=utf-8",
+                        success: function (res) {
+                            if (res.status === 205) {
+                                layer.msg("修改成功", {
+                                    icon: 1,
+                                    time: 1000
+                                }, function () {
+
+                                        var index = parent.layer.getFrameIndex(window.name);
+                                        parent.location.reload(); //刷新父页面
+                                        parent.layer.close(index);
+
+                                })
+                            } else {
+                                layer.msg(res.statusInfo.detail, {
+                                    icon: 5,
+                                    time: 1000
+                                }, function () {
+                                    flagForForm = false;
+                                })
+                            }
+                        }
+                    })
+
+                }
+            }
+        }
+
+
+    })
 </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/target/classes/templates/pages/company/company-out.html b/target/classes/templates/pages/company/company-out.html
index e035f31b..c99ce615 100644
--- a/target/classes/templates/pages/company/company-out.html
+++ b/target/classes/templates/pages/company/company-out.html
@@ -57,6 +57,7 @@
         <script type="text/html" id="currentTableBar">
             <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="post">岗位</a>
         </script>
 
     </div>
@@ -166,7 +167,7 @@
                     layer.full(index);
                 });
                 return false;
-            } else if (obj.event == 'subclass') {
+            } else if (obj.event === 'subclass') {
                 var index = layer.open({
                     title: '子公司',
                     type: 2,
@@ -181,6 +182,21 @@
                 });
                 return false;
             }
+            else if (obj.event === 'post') {
+                var index = layer.open({
+                    title: '岗位列表',
+                    type: 2,
+                    shade: 0.2,
+                    maxmin: true,
+                    shadeClose: true,
+                    area: ['100%', '100%'],
+                    content: '/findPostByOrganization?organization=' + data.id
+                });
+                $(window).on("resize", function () {
+                    layer.full(index);
+                });
+                return false;
+            }
         })
     });
 </script>
diff --git a/target/classes/templates/pages/post/post-out.html b/target/classes/templates/pages/post/post-out.html
index cb260d4a..7430b8a1 100644
--- a/target/classes/templates/pages/post/post-out.html
+++ b/target/classes/templates/pages/post/post-out.html
@@ -56,8 +56,8 @@
         <script type="text/html" id="currentTableBar">
             <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 layui-btn-warm" lay-event="addRoleIn">入库审核权</a>
+<!--            <a class="layui-btn  layui-btn-xs data-count-edit" lay-event="add_role">设置权限</a>-->
+<!--            <a class="layui-btn  layui-btn-xs layui-btn-warm" lay-event="addRoleIn">入库审核权</a>-->
         </script>
 
     </div>
@@ -114,7 +114,19 @@
             limit: 10,
             page: true,
             skin: 'line',
-            done: function () {
+            done: function (res, curr, count) {
+                $.each(res['data'], function (i, j) {
+                    let administrativeorganization = j["administrativeorganization"];
+                    var controlItem = $("[lay-id='currentTableId'] tr:eq(" + (i + 1) + ")").children()[8];
+                    var aItem = controlItem.childNodes[0];
+                    if(administrativeorganization === 361){
+
+                        $(aItem).append('<a class="layui-btn layui-btn-xs layui-btn-danger " lay-event="addRoleIn">设置权限</a>')
+                    }else{
+                        $(aItem).append('<a class="layui-btn layui-btn-xs layui-btn-danger " lay-event="add_role">设置权限</a>')
+
+                    }
+                })
             }
         });
 
@@ -194,7 +206,6 @@
                 });
                 return false;
             }else if (obj.event === 'addRoleIn') {
-
                 var index = layer.open({
                     type: 2,
                     title: '权限信息',