From 1983ad87b61ccea8a24216bd9e9b44877abf2c01 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期三, 23 四月 2025 18:08:38 +0800
Subject: [PATCH] 初步完成调试

---
 src/main/webapp/views/pakStoreSxk/locDetlCheckQuery.html    |  238 +++++
 src/main/webapp/static/js/pakStore/emptyOut.js              |    3 
 src/main/java/com/zy/asrs/controller/Work7Controller.java   |  310 ++++++
 src/main/webapp/views/pakStore/locDetlQuery.html            |   26 
 src/main/java/com/zy/asrs/controller/WorkController.java    |   24 
 src/main/webapp/static/js/pakStoreSxk/emptyOut.js           |  190 ++++
 src/main/webapp/views/pakStoreSxk/crnLocCheckOut.html       |  148 +++
 src/main/webapp/views/pakStoreSxk/locDetlQuery.html         |  210 ++++
 src/main/webapp/static/js/ioWorks/stockOut.js               |    1 
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |   14 
 src/main/webapp/views/pakStoreSxk/locMove.html              |  130 ++
 src/main/webapp/views/pakStoreSxk/emptyOut.html             |  142 +++
 src/main/java/com/zy/asrs/controller/LocDetlController.java |   92 +
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java |    2 
 src/main/java/com/zy/asrs/controller/OpenController.java    |    6 
 src/main/webapp/static/js/pakStoreSxk/crnLocCheckOut.js     |  168 +++
 src/main/webapp/static/js/pakStoreSxk/stockOut.js           |  178 +++
 src/main/java/com/zy/asrs/task/WorkMastScheduler.java       |   78 +
 src/main/resources/mapper/WrkMastMapper.xml                 |    2 
 src/main/webapp/views/pakStore/emptyOut.html                |    6 
 src/main/java/com/zy/asrs/entity/RowLastno.java             |    3 
 src/main/webapp/views/pakStoreSxk/stockOut.html             |  131 ++
 src/main/webapp/static/js/pakStore/stockOut.js              |    1 
 src/main/webapp/views/pakStoreSxk/locCheckOut.html          |  132 ++
 src/main/webapp/views/pakStoreSxk/matQuery.html             |  173 +++
 src/main/resources/application.yml                          |    2 
 src/main/webapp/static/js/pakStoreSxk/locCheckOut.js        |  138 +++
 src/main/webapp/views/pakStoreSxk/pakStore.html             |  133 ++
 28 files changed, 2,604 insertions(+), 77 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 0769dab..407749d 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -54,7 +54,7 @@
 
     @RequestMapping(value = "/locDetl/auth")
     @ManagerAuth
-    public R stockOutList(@RequestParam(value = "locNos[]") List<String> locNos){
+    public R stockOutList(@RequestParam(value = "locNos[]") List<String> locNos) {
         if (!locNos.isEmpty()) {
             List<LocDetl> res = new ArrayList<>();
             for (String locNo : new HashSet<>(locNos)) {
@@ -70,10 +70,10 @@
 
     @RequestMapping(value = "/stock/out/list/auth")
     @ManagerAuth
-    public R stockOutList(@RequestParam(defaultValue = "1")Integer curr,
-                          @RequestParam(defaultValue = "10")Integer limit,
-                          @RequestParam Map<String, Object> param){
-        if (!Cools.isEmpty(param.get("modi_time"))){
+    public R stockOutList(@RequestParam(defaultValue = "1") Integer curr,
+                          @RequestParam(defaultValue = "10") Integer limit,
+                          @RequestParam Map<String, Object> param) {
+        if (!Cools.isEmpty(param.get("modi_time"))) {
             String val = String.valueOf(param.get("modi_time"));
             if (val.contains(RANGE_TIME_LINK)) {
                 String[] dates = val.split(RANGE_TIME_LINK);
@@ -83,7 +83,7 @@
             }
         }
         Page<LocDetl> stockOut = locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class));
-        if (stockOut.getRecords().size()==0){
+        if (stockOut.getRecords().size() == 0) {
             stockOut = locDetlService.getStockOut(toPage(1, limit, param, LocDetl.class));
         }
         return R.ok(stockOut);
@@ -92,9 +92,9 @@
     @RequestMapping(value = "/stock/out/crn/list/auth")
     @ManagerAuth
     public R crnStockOutList(@RequestParam(defaultValue = "1") Integer curr,
-                          @RequestParam(defaultValue = "10") Integer limit,
-                          @RequestParam Map<String, Object> param){
-        if (!Cools.isEmpty(param.get("modi_time"))){
+                             @RequestParam(defaultValue = "10") Integer limit,
+                             @RequestParam Map<String, Object> param) {
+        if (!Cools.isEmpty(param.get("modi_time"))) {
             String val = String.valueOf(param.get("modi_time"));
             if (val.contains(RANGE_TIME_LINK)) {
                 String[] dates = val.split(RANGE_TIME_LINK);
@@ -106,11 +106,17 @@
         param.remove("curr");
         param.remove("limit");
         EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
+        if (param.get("crn_no") != null) {
+            if (param.get("crn_no").toString().equalsIgnoreCase("1")) {
+                wrapper.addFilter("LEFT(loc_no,2)<=4");
+            } else {
+                wrapper.addFilter("LEFT(loc_no,2)>=5 and LEFT(loc_no,2)<=16");
+            }
+        }
+        param.remove("crn_no");
         convert(param, wrapper);
-        wrapper.addFilter("LEFT(loc_no,2)>=1 and LEFT(loc_no,2)<=16");
-//        Page<LocDetl> stockOut = locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class));
         Page<LocDetl> locDetlPage = locDetlService.selectPage(new Page<>(curr, limit), wrapper);
-        if (locDetlPage.getRecords().size()==0){
+        if (locDetlPage.getRecords().size() == 0) {
             locDetlPage = locDetlService.selectPage(new Page<>(1, limit), wrapper);
         }
         return R.ok(locDetlPage);
@@ -118,12 +124,12 @@
 
     @RequestMapping(value = "/locDetl/list/auth")// /locDetl/list/auth 鎺ュ彛闂
     @ManagerAuth
-    public R list(@RequestParam(defaultValue = "1")Integer curr,
-                  @RequestParam(defaultValue = "10")Integer limit,
-                  @RequestParam(required = false)String orderByField,
-                  @RequestParam(required = false)String orderByType,
-                  @RequestParam(required = false)String condition,
-                  @RequestParam Map<String, Object> param){
+    public R list(@RequestParam(defaultValue = "1") Integer curr,
+                  @RequestParam(defaultValue = "10") Integer limit,
+                  @RequestParam(required = false) String orderByField,
+                  @RequestParam(required = false) String orderByType,
+                  @RequestParam(required = false) String condition,
+                  @RequestParam Map<String, Object> param) {
 //        String row = "";
         EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
 //        if (param.get("row") != null) {
@@ -140,8 +146,10 @@
         convert(param, wrapper);
         allLike(LocDetl.class, param.keySet(), wrapper, condition);
         // 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
-        RoleUtils.addRoleWrapperByLocNo(getUserId(),wrapper);
-        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+        RoleUtils.addRoleWrapperByLocNo(getUserId(), wrapper);
+        if (!Cools.isEmpty(orderByField)) {
+            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+        }
 //        if (!row.equals("")){
 //            wrapper.and()
 //                    .where("loc_no like '" +row +"%'");
@@ -150,10 +158,10 @@
     }
 
 
-    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
-        for (Map.Entry<String, Object> entry : map.entrySet()){
+    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+        for (Map.Entry<String, Object> entry : map.entrySet()) {
             String val = String.valueOf(entry.getValue());
-            if (val.contains(RANGE_TIME_LINK)){
+            if (val.contains(RANGE_TIME_LINK)) {
                 String[] dates = val.split(RANGE_TIME_LINK);
                 wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                 wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -178,10 +186,10 @@
         return R.ok();
     }
 
-	@RequestMapping(value = "/locDetl/update/auth")
-	@ManagerAuth(memo = "搴撲綅鏄庣粏淇敼")
-    public R update(LocDetl locDetl){
-        if (Cools.isEmpty(locDetl) || null==locDetl.getMatnr()){
+    @RequestMapping(value = "/locDetl/update/auth")
+    @ManagerAuth(memo = "搴撲綅鏄庣粏淇敼")
+    public R update(LocDetl locDetl) {
+        if (Cools.isEmpty(locDetl) || null == locDetl.getMatnr()) {
             return R.error();
         }
         locDetl.setModiUser(getUserId());
@@ -192,12 +200,12 @@
 
     @RequestMapping(value = "/locDetl/delete/auth")
     @ManagerAuth(memo = "搴撲綅鏄庣粏鍒犻櫎")
-    public R delete(@RequestParam String param){
+    public R delete(@RequestParam String param) {
         List<LocDetl> list = JSONArray.parseArray(param, LocDetl.class);
-        if (Cools.isEmpty(list)){
+        if (Cools.isEmpty(list)) {
             return R.error();
         }
-        for (LocDetl entity : list){
+        for (LocDetl entity : list) {
             locDetlService.delete(new EntityWrapper<>(entity));
         }
         return R.ok();
@@ -205,7 +213,7 @@
 
     @RequestMapping(value = "/locDetl/export/auth")
     @ManagerAuth(memo = "搴撲綅鏄庣粏瀵煎嚭")
-    public R export(@RequestBody JSONObject param){
+    public R export(@RequestBody JSONObject param) {
         List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
         EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
         Map<String, Object> map = excludeTrash(param.getJSONObject("locDetl"));
@@ -215,15 +223,15 @@
             if (chooseRow.length() == 1) {
                 row = "0" + chooseRow;
                 map.remove("row");
-            }else {
+            } else {
                 row = chooseRow;
                 map.remove("row");
             }
         }
         convert(map, wrapper);
-        if (!row.equals("")){
+        if (!row.equals("")) {
             wrapper.and()
-                    .where("loc_no like '" +row +"%'");
+                    .where("loc_no like '" + row + "%'");
         }
         List<LocDetl> list = locDetlService.selectList(wrapper);
         return R.ok(exportSupport(list, fields));
@@ -236,7 +244,7 @@
         wrapper.like("matnr", condition);
         Page<LocDetl> page = locDetlService.selectPage(new Page<>(0, 10), wrapper);
         List<Map<String, Object>> result = new ArrayList<>();
-        for (LocDetl locDetl : page.getRecords()){
+        for (LocDetl locDetl : page.getRecords()) {
             Map<String, Object> map = new HashMap<>();
             map.put("id", locDetl.getMatnr());
             map.put("value", locDetl.getMatnr());
@@ -249,7 +257,7 @@
     @ManagerAuth
     public R query(@RequestBody JSONObject param) {
         Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
-        if (null != locDetlService.selectOne(wrapper)){
+        if (null != locDetlService.selectOne(wrapper)) {
             return R.parse(BaseRes.REPEAT).add(getComment(LocDetl.class, String.valueOf(param.get("key"))));
         }
         return R.ok();
@@ -257,8 +265,8 @@
 
     @RequestMapping(value = "/locDetl/statis/auth")
     @ManagerAuth
-    public R statis(@RequestParam(defaultValue = "1")Integer curr,
-                    @RequestParam(defaultValue = "10")Integer limit,
+    public R statis(@RequestParam(defaultValue = "1") Integer curr,
+                    @RequestParam(defaultValue = "10") Integer limit,
                     @RequestParam Map<String, Object> param) {
         Page<LocDetl> stockStatis = locDetlService.getStockStatis(toPage(curr, limit, param, LocDetl.class));
         for (LocDetl locDetl : stockStatis.getRecords()) {
@@ -295,6 +303,7 @@
 
     /**
      * 鑾峰彇搴撳瓨鎬绘暟
+     *
      * @return
      */
     @RequestMapping("/locDetl/count")
@@ -305,15 +314,16 @@
 
     /**
      * 鑾峰彇搴撳瓨鎬绘暟
+     *
      * @return
      */
     @RequestMapping("/locDetl/matnr/count")
-    public R getCount(@RequestBody Map<String, String> param){
+    public R getCount(@RequestBody Map<String, String> param) {
         String matnr = param.get("matnr");
         Double sum = 0.0;
-        if (Cools.isEmpty(matnr)){
+        if (Cools.isEmpty(matnr)) {
             sum = locDetlService.sum();
-        }else {
+        } else {
             sum = locDetlService.getSumAnfme(matnr);
         }
 
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index e8f1218..7547998 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -96,7 +96,11 @@
                 }
             } else {
                 if (!Cools.isEmpty(param.getMsgType()) && param.getMsgType().equalsIgnoreCase("task_complete")) {
-                    wrkMast.setWrkSts(14L);
+                    if (wrkMast.getStaNo()==1031){
+                        wrkMast.setWrkSts(106L);
+                    }else {
+                        wrkMast.setWrkSts(14L);
+                    }
                 }
             }
             wrkMast.setModiTime(new Date());
diff --git a/src/main/java/com/zy/asrs/controller/Work7Controller.java b/src/main/java/com/zy/asrs/controller/Work7Controller.java
new file mode 100644
index 0000000..412638b
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/Work7Controller.java
@@ -0,0 +1,310 @@
+package com.zy.asrs.controller;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.annotations.ManagerAuth;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.asrs.entity.StaDesc;
+import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.entity.param.EmptyPlateOutParam;
+import com.zy.asrs.entity.param.FullStoreParam;
+import com.zy.asrs.entity.param.LocDetlAdjustParam;
+import com.zy.asrs.entity.param.StockOutParam;
+import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.StaDescService;
+import com.zy.asrs.service.WorkService;
+import com.zy.asrs.utils.Utils;
+import com.zy.common.model.StartupDto;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.*;
+
+/**
+ * 宸ヤ綔娴佹帴鍙ｆ帶鍒跺櫒
+ * Created by vincent on 2020/6/10
+ */
+@RestController
+@RequestMapping("/sxk")
+public class Work7Controller extends BaseController {
+
+    @Autowired
+    private WorkService workService;
+    @Autowired
+    private BasDevpService basDevpService;
+    @Autowired
+    private StaDescService staDescService;
+
+    @RequestMapping("/locMerge/out/start")
+    @ManagerAuth(memo = "骞舵澘鍑哄簱")
+    public R locMergeOutStart(@RequestBody StockOutParam param) {
+        workService.locMergeOut(param, getUserId());
+        return R.ok("鍑哄簱鍚姩鎴愬姛");
+    }
+
+    @RequestMapping("/locMerge/out/start/sxk")
+    @ManagerAuth(memo = "骞舵澘鍑哄簱")
+    public R locMergeOutStartSxk(@RequestBody StockOutParam param) {
+        workService.locMergeOutSxk(param, getUserId());
+        return R.ok("鍑哄簱鍚姩鎴愬姛");
+    }
+
+    @RequestMapping("/available/put/site")
+    @ManagerAuth()
+    public R availablePutSite() {
+        return R.ok().add(basDevpService.getAvailableInSite());
+    }
+
+    @RequestMapping("/available/empty/put/site")
+    @ManagerAuth()
+    public R availableEmptyPutSite() {
+        return R.ok().add(basDevpService.getAvailableEmptyInSite());
+    }
+
+    @RequestMapping("/available/take/site")
+    @ManagerAuth()
+    public R availableTakeSite() {
+        Set<Map<String, Object>> result = new HashSet<>();
+        EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
+        wrapper.eq("type_no", 101).eq("crn_no", 7).orderBy("stn_no", true);
+        List<StaDesc> staDescs = staDescService.selectList(wrapper);
+        for (StaDesc site : staDescs) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("siteId", site.getStnNo());
+            map.put("desc", site.getStnDesc() + site.getStnNo());
+            result.add(map);
+        }
+
+        EntityWrapper<StaDesc> wrapper2 = new EntityWrapper<>();
+        wrapper2.eq("type_no", 103).eq("crn_no", 7).orderBy("stn_no", true);
+        List<StaDesc> staDescs2 = staDescService.selectList(wrapper2);
+        for (StaDesc site : staDescs2) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("siteId", site.getStnNo());
+            map.put("desc", site.getStnDesc() + site.getStnNo());
+            result.add(map);
+        }
+        return R.ok().add(result);
+    }
+
+    @RequestMapping("/crn/available/take/site")
+    @ManagerAuth()
+    public R crnAvailableTakeSite() {
+        List<Map<String, Object>> result = new ArrayList<>();
+        List<Integer> outSite = basDevpService.getCrnAvailableOutSite(101);
+        for (Integer siteId : outSite) {
+            if (siteId >= 1100) {
+                continue;
+            }
+            Map<String, Object> map = new HashMap<>();
+            map.put("siteId", siteId);
+            map.put("desc", siteId + "锛堝叏鏉垮嚭搴撳彛锛�");
+            result.add(map);
+        }
+        List<Integer> pickOutSite = basDevpService.getCrnAvailableOutSite(103);
+        for (Integer siteId : pickOutSite) {
+            if (siteId >= 1100) {
+                continue;
+            }
+            Map<String, Object> map = new HashMap<>();
+            map.put("siteId", siteId);
+            map.put("desc", siteId + "锛堟嫞鏂欏嚭搴撳彛锛�");
+            result.add(map);
+        }
+        return R.ok().add(result);
+    }
+
+    @RequestMapping("/available/take/check/site")
+    @ManagerAuth()
+    public R availableTakeCheckSite() {
+        List<Integer> availableOutSite = basDevpService.getAvailableOutSite(107);
+        List<Integer> data = new ArrayList<>();
+        for (Integer x : availableOutSite) {
+            if (x >= 1100) {
+                data.add(x);
+            }
+        }
+        return R.ok().add(data);
+    }
+
+    @RequestMapping("/available/take/merge/site")
+    @ManagerAuth()
+    public R availableTakeMergeSite() {
+        return R.ok().add(basDevpService.getAvailableOutSite(104));
+    }
+
+    @RequestMapping("/available/take/check/site/crn")
+    @ManagerAuth()
+    public R availableTakeCheckSiteCrn() {
+        EntityWrapper<StaDesc> staDescEntityWrapper = new EntityWrapper<>();
+        staDescEntityWrapper.eq("type_no", 107);
+        staDescEntityWrapper.setSqlSelect("DISTINCT stn_no as stnNo");
+        staDescEntityWrapper.in("crn_no", 7);
+        return R.ok().add(staDescService.selectList(staDescEntityWrapper));
+    }
+
+
+    @RequestMapping("/available/take/check/site/ctu")
+    @ManagerAuth()
+    public R availableTakeCheckSiteCtu() {
+        return R.ok().add(basDevpService.getAvailableOutSite(107));
+    }
+
+    @RequestMapping("/available/take/check/site/shuttle")
+    @ManagerAuth()
+    public R availableTakeCheckSiteShuttle() {
+        return R.ok().add(basDevpService.getAvailableOutSite(107));
+    }
+
+    @RequestMapping("/available/crn/empty/take/site")
+    @ManagerAuth()
+    public R availablecrnEmptyTakeSite() {
+        return R.ok().add(basDevpService.getCrnAvailableEmptyOutSite());
+    }
+
+    @RequestMapping("/available/shuttle/empty/take/site")
+    @ManagerAuth()
+    public R availableshuttleEmptyTakeSite() {
+        return R.ok().add(basDevpService.getShuttleAvailableEmptyOutSite());
+    }
+
+    @RequestMapping("/available/ctu/empty/take/site")
+    @ManagerAuth()
+    public R availablectuEmptyTakeSite() {
+        return R.ok().add(basDevpService.getCtuAvailableEmptyOutSite());
+    }
+
+    @RequestMapping("/available/empty/take/site")
+    @ManagerAuth()
+    public R availableEmptyTakeSite(StaDesc param) {
+        List<Map<String, Object>> result = new ArrayList<>();
+        EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
+        wrapper.eq("type_no", 110);
+        if (param != null && param.getCrnNo() != null) {
+            wrapper.eq("crn_no", param.getCrnNo());
+        }
+        // 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
+//        RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
+        List<StaDesc> staDescs = staDescService.selectList(wrapper);
+        for (StaDesc staDesc : staDescs) {
+            if (staDesc.getCrnNo() == 1) {
+                continue;
+            }
+            Map<String, Object> map = new HashMap<>();
+            map.put("siteId", staDesc.getStnNo());
+            map.put("desc", "[" + Utils.getStaName(staDesc.getStnNo()) + "]");
+            result.add(map);
+        }
+        return R.ok().add(result);
+//        return R.ok().add(basDevpService.getAvailableEmptyOutSite());
+    }
+
+    @RequestMapping("/full/store/put/start")
+    @ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
+    public R fullStorePutStart(@RequestBody FullStoreParam fullStoreParam) {
+        try {
+            String locNo = workService.startupFullPutStore(fullStoreParam, getUserId());
+            return R.ok("鍏ュ簱鍚姩鎴愬姛").add(locNo);
+        } catch (Exception e) {
+            return R.error("鍏ュ簱鍚姩澶辫触==>" + e.getMessage());
+        }
+    }
+
+    @RequestMapping("/plate/out/start")
+    @ManagerAuth(memo = "鍑哄簱浣滀笟")
+    public R fullStoreTakeStart(@RequestBody StockOutParam param) {
+        workService.startupFullTakeStore(param, getUserId());
+        return R.ok("鍑哄簱鍚姩鎴愬姛");
+    }
+
+    @RequestMapping("/empty/plate/in/start")
+    @ManagerAuth(memo = "绌烘澘鍏ュ簱")
+    public R emptyPlateInStart(@RequestParam Integer sourceStaNo) {
+        return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.emptyPlateIn(sourceStaNo, getUserId()));
+    }
+
+    @RequestMapping("/empty/plate/out/start")
+    @ManagerAuth(memo = "绌烘澘鍑哄簱")
+    public R emptyPlateOutStart(EmptyPlateOutParam param) {
+        workService.emptyPlateOut(param, getUserId());
+        return R.ok("鍑哄簱鍚姩鎴愬姛");
+    }
+
+    @RequestMapping("/locCheck/out/start")
+    @ManagerAuth(memo = "鐩樼偣鍑哄簱")
+    public R locCheckOutStart(@RequestBody StockOutParam param) {
+        workService.locCheckOut(param, getUserId());
+        return R.ok("鍑哄簱鍚姩鎴愬姛");
+    }
+
+    @RequestMapping("/locCheck/out/start/sxk")
+    @ManagerAuth(memo = "鐩樼偣鍑哄簱")
+    public R locCheckOutStartsxk(@RequestBody StockOutParam param) {
+        workService.locCheckOutsxk(param, getUserId());
+        return R.ok("鍑哄簱鍚姩鎴愬姛");
+    }
+
+    @RequestMapping("/loc/move/start")
+    @ManagerAuth(memo = "搴撲綅绉昏浆")
+    public R locMoveStart(@RequestParam String sourceLocNo,
+                          @RequestParam String targetLocNo) {
+        workService.locMove(sourceLocNo, targetLocNo, getUserId());
+        return R.ok("绉诲簱鍚姩鎴愬姛");
+    }
+
+    @RequestMapping("/mat/turn/over/out/start")
+    @ManagerAuth(memo = "鍝佸彿绉讳氦")
+    public R turnMatLocDetl(@RequestBody EmptyPlateOutParam param) {
+        if (Cools.isEmpty(param) || Cools.isEmpty(param.getLocDetls(), param.getMatId()) || Cools.isEmpty(param.getLocDetls().get(0)) || Cools.isEmpty(param.getLocDetls().get(0).getMatnr())) {
+            return R.error("鍙傛暟涓虹┖");
+        }
+        if (param.getLocDetls().size() > 1) {
+            return R.error("璇峰崟鏉℃暟鎹慨鏀癸紝璋ㄦ厧鎿嶄綔锛�");
+        }
+        workService.turnMatLocDetl(param, getUserId());
+        return R.ok("鍝佸彿绉讳氦鎴愬姛");
+    }
+
+    @RequestMapping("/locDdetl/adjust/start")
+    @ManagerAuth(memo = "搴撳瓨璋冩暣")
+    public R locDetlAdjustStart(@RequestBody LocDetlAdjustParam param) {
+        workService.adjustLocDetl(param, getUserId());
+        return R.ok("搴撳瓨璋冩暣鎴愬姛");
+    }
+
+    @RequestMapping("/hand/control/wrkMast")
+    @ManagerAuth(memo = "鎵嬪姩澶勭悊宸ヤ綔妗�")
+    public R handControlWrkMast(@RequestParam String workNo,
+                                @RequestParam Integer type) {
+        if (type == 1) {
+            workService.completeWrkMast(workNo, getUserId());
+            return R.ok("宸ヤ綔妗ｅ凡瀹屾垚");
+        } else if (type == 2) {
+            workService.cancelWrkMast(workNo, getUserId());
+            return R.ok("宸ヤ綔妗ｅ凡鍙栨秷");
+        } else if (type == 3) {
+            workService.pickWrkMast(workNo, getUserId());
+            return R.ok("宸ヤ綔妗ｅ凡鎷ｆ枡");
+        }
+        return R.ok();
+    }
+
+    @RequestMapping("/create/waitPain/wrkMast/start")
+    @ManagerAuth(memo = "鐢熸垚浠诲姟")
+    public R createWaitPainWrkMastStart(@RequestBody List<WaitPakin> list) {
+        StartupDto startupDto = workService.createWaitPainWrkMastStart(list, getUserId());
+        return R.ok("浠诲姟鍙凤細" + startupDto.getWorkNo() + ";鐩爣搴撲綅锛�" + startupDto.getLocNo());
+    }
+
+    @RequestMapping("/deal/preHave/start")
+    @ManagerAuth(memo = "鍏堝叆鍝佸鐞�")
+    public R dealPreHave(@RequestParam Integer wrkNo) {
+        String locNo = workService.dealPreHaveStart(wrkNo, getUserId());
+        return R.ok("浠诲姟閲嶆柊鍏ュ簱锛岀洰鏍囧簱浣嶏細" + locNo);
+    }
+
+}
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 343dc04..ded73a3 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -69,7 +69,7 @@
     public R availableTakeSite() {
         Set<Map<String, Object>> result = new HashSet<>();
         EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
-        wrapper.eq("type_no", 101).orderBy("stn_no", true);
+        wrapper.eq("type_no", 101).eq("crn_no", 1).orderBy("stn_no", true);
         List<StaDesc> staDescs = staDescService.selectList(wrapper);
         for (StaDesc site : staDescs) {
             Map<String, Object> map = new HashMap<>();
@@ -79,7 +79,7 @@
         }
 
         EntityWrapper<StaDesc> wrapper2 = new EntityWrapper<>();
-        wrapper2.eq("type_no", 103).orderBy("stn_no", true);
+        wrapper2.eq("type_no", 103).eq("crn_no", 1).orderBy("stn_no", true);
         List<StaDesc> staDescs2 = staDescService.selectList(wrapper2);
         for (StaDesc site : staDescs2) {
             Map<String, Object> map = new HashMap<>();
@@ -96,6 +96,9 @@
         List<Map<String, Object>> result = new ArrayList<>();
         List<Integer> outSite = basDevpService.getCrnAvailableOutSite(101);
         for (Integer siteId : outSite) {
+            if (siteId < 1100) {
+                continue;
+            }
             Map<String, Object> map = new HashMap<>();
             map.put("siteId", siteId);
             map.put("desc", siteId + "锛堝叏鏉垮嚭搴撳彛锛�");
@@ -103,6 +106,9 @@
         }
         List<Integer> pickOutSite = basDevpService.getCrnAvailableOutSite(103);
         for (Integer siteId : pickOutSite) {
+            if (siteId < 1100) {
+                continue;
+            }
             Map<String, Object> map = new HashMap<>();
             map.put("siteId", siteId);
             map.put("desc", siteId + "锛堟嫞鏂欏嚭搴撳彛锛�");
@@ -114,7 +120,14 @@
     @RequestMapping("/available/take/check/site")
     @ManagerAuth()
     public R availableTakeCheckSite() {
-        return R.ok().add(basDevpService.getAvailableOutSite(107));
+        List<Integer> availableOutSite = basDevpService.getAvailableOutSite(107);
+        List<Integer> data = new ArrayList<>();
+        for (Integer x : availableOutSite) {
+            if (x < 1100) {
+                data.add(x);
+            }
+        }
+        return R.ok().add(data);
     }
 
     @RequestMapping("/available/take/merge/site")
@@ -129,7 +142,7 @@
         EntityWrapper<StaDesc> staDescEntityWrapper = new EntityWrapper<>();
         staDescEntityWrapper.eq("type_no", 107);
         staDescEntityWrapper.setSqlSelect("DISTINCT stn_no as stnNo");
-        staDescEntityWrapper.in("crn_no", 1, 2, 3, 4, 5, 6, 7);
+        staDescEntityWrapper.in("crn_no", 1);
         return R.ok().add(staDescService.selectList(staDescEntityWrapper));
     }
 
@@ -173,6 +186,9 @@
 //        RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
         List<StaDesc> staDescs = staDescService.selectList(wrapper);
         for (StaDesc staDesc : staDescs) {
+            if (staDesc.getCrnNo() == 7) {
+                continue;
+            }
             Map<String, Object> map = new HashMap<>();
             map.put("siteId", staDesc.getStnNo());
             map.put("desc", "[" + Utils.getStaName(staDesc.getStnNo()) + "]");
diff --git a/src/main/java/com/zy/asrs/entity/RowLastno.java b/src/main/java/com/zy/asrs/entity/RowLastno.java
index e4dedf1..5160dbd 100644
--- a/src/main/java/com/zy/asrs/entity/RowLastno.java
+++ b/src/main/java/com/zy/asrs/entity/RowLastno.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.zy.asrs.service.BasWhsService;
 import com.zy.asrs.service.RowLastnoTypeService;
 import com.zy.system.entity.User;
@@ -384,7 +385,7 @@
         RowLastnoTypeService rowLastnoTypeService = SpringUtils.getBean(RowLastnoTypeService.class);
         RowLastnoType rowLastnoType = rowLastnoTypeService.selectById(this.typeId.longValue());
         BasWhsService basWhsService = SpringUtils.getBean(BasWhsService.class);
-        BasWhs basWhs = basWhsService.selectById(rowLastnoType.getType().longValue());
+        BasWhs basWhs = basWhsService.selectOne(new EntityWrapper<BasWhs>().eq("identifying",rowLastnoType.getType().longValue()) );
         if (!Cools.isEmpty(rowLastnoType)){
             return rowLastnoType.getTypeName()+"<==>"+rowLastnoType.getMemo()+"<==>"+basWhs.getWhsDesc();
         }
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index f956445..237d191 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -1884,9 +1884,11 @@
         WrkMast wrkMast = new WrkMast();
         wrkMast.setWrkNo(workNo);
         wrkMast.setIoTime(new Date());
-        wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細1.鐢熸垚鍏ュ簱ID
-        wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細 1.搴撴牸绉昏浇
+        wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細1.鐢熸垚鍏ュ簱ID
+        wrkMast.setIoType(wrkMastold.getIoType() - 100); // 鍏ュ嚭搴撶姸鎬侊細 1.搴撴牸绉昏浇
         wrkMast.setIoPri(12D);
+        wrkMast.setStaNo(1032);
+        wrkMast.setSourceStaNo(1031);
         wrkMast.setCrnNo(7);
         wrkMast.setLocNo(dto.getLocNo()); // 鐩爣搴撲綅
         wrkMast.setFullPlt("Y"); // 婊℃澘
@@ -1933,7 +1935,7 @@
     public void toCrn(WrkMast wrkMastold, List<WrkDetl> wrkDetls, Short locType) {
         LocTypeDto locTypeDto = new LocTypeDto();
         locTypeDto.setLocType1(locType);
-        StartupDto dto = commonService.getLocNo(1, 1035, null, null, null, locTypeDto, false);
+        StartupDto dto = commonService.getLocNo(1, 1135, null, null, null, locTypeDto, false);
         if (Cools.isEmpty(dto)) {
             throw new CoolException("鍘诲爢鍨涙満鏈壘鍒板簱浣�");
         }
@@ -1945,9 +1947,11 @@
         wrkMast.setWrkNo(workNo);
         wrkMast.setIoTime(new Date());
         wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細1.鐢熸垚鍏ュ簱ID
-        wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細 1.鍏ュ簱
+        wrkMast.setIoType(wrkMastold.getIoType() - 100);  // 鍏ュ嚭搴撶姸鎬侊細 1.鍏ュ簱
         wrkMast.setIoPri(12D);
-        wrkMast.setCrnNo(7);
+        wrkMast.setCrnNo(1);
+        wrkMast.setStaNo(1131);
+        wrkMast.setSourceStaNo(1135);
         wrkMast.setLocNo(dto.getLocNo()); // 鐩爣搴撲綅
         wrkMast.setFullPlt(wrkDetls == null ? "N" : "Y"); // 婊℃澘
         wrkMast.setPicking("N"); // 鎷ｆ枡
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index 9b0bf4c..cb810d7 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -15,6 +15,8 @@
 import com.zy.asrs.task.core.ReturnT;
 import com.zy.asrs.task.handler.WorkMastHandler;
 import com.zy.common.utils.HttpHandler;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,6 +44,8 @@
     private String shuttleWcsUrl;
     @Autowired
     private LocMastServiceImpl locMastService;
+    @Autowired
+    private ConfigService configService;
 
 
     @Scheduled(cron = "0/3 * * * * ? ")
@@ -65,6 +69,7 @@
 
     @Scheduled(cron = "0/3 * * * * ? ") //鍏ュ簱浠诲姟涓嬪彂
     private void ShuttleInTaskSend() {
+        procesMode();
         List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                 .eq("wrk_sts", 2).in("io_type", 1, 10, 53, 54, 57).eq("crn_no", 7));
         if (Cools.isEmpty(wrkMasts)) {
@@ -73,10 +78,21 @@
 
         try {
             for (WrkMast wrkMast : wrkMasts) {
+                if (wrkMast.getStaNo() == 1031) {
+                    Config config = configService.selectConfigByCode("2.5F_Mode");
+                    if (Cools.isEmpty(config) || config.getValue().equals("false")) {
+                        return;
+                    }
+                    if (config.getValue().equalsIgnoreCase("1")) {
+                        log.info("妯″紡涓嶅2");
+                        return;
+                    }
+                }
                 LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()));
                 if (locMast == null) {
                     throw new CoolException("涓嬪彂鍥涘悜杞cs浠诲姟澶辫触");
                 }
+
                 String loc;
                 if ((locMast.getRow1() - 4) >= 10) {
                     loc = (locMast.getRow1() - 4) + locMast.getLocNo().substring(2);
@@ -115,18 +131,25 @@
 
     @Scheduled(cron = "0/3 * * * * ? ") //鍑哄簱搴撲换鍔′笅鍙�
     private void ShuttleOutTaskSend() {
+        procesMode();
         List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                 .in("io_type", 101, 110, 103, 104, 107)
                 .eq("wrk_sts", 11).eq("crn_no", 7));
         if (Cools.isEmpty(wrkMasts)) {
             return;
         }
-//        List<WrkMast> wrkMasts = wrkMastService.selectToShuttleOutTask();
-//        if (wrkMasts.isEmpty()) {
-//            return;
-//        }
         try {
             for (WrkMast wrkMast : wrkMasts) {
+                if (wrkMast.getStaNo() == 1031) {
+                    Config config = configService.selectConfigByCode("2.5F_Mode");
+                    if (Cools.isEmpty(config) || config.getValue().equals("false")) {
+                        return;
+                    }
+                    if (config.getValue().equalsIgnoreCase("2")) {
+                        log.info("妯″紡涓嶅2");
+                        return;
+                    }
+                }
                 LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()));
                 if (locMast == null) {
                     throw new CoolException("涓嬪彂鍥涘悜杞cs浠诲姟澶辫触");
@@ -207,5 +230,52 @@
 
     }
 
+    //@Scheduled(cron = "0/3 * * * * ? ") //绉诲簱浠诲姟涓嬪彂
+    public void switchMode() {
+        procesMode();
+    }
 
+    //1:浠庡洓鍚戝簱鍒板爢鍨涙満搴�
+    //2:浠庡爢鍨涙満搴撳埌鍥涘悜搴�
+    private void procesMode() {
+        Config config = configService.selectConfigByCode("2.5F_Mode");
+        if (Cools.isEmpty(config) || config.getValue().equals("false")) {
+            return;
+        }
+        List<WrkMast> wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+                .in("io_type", 1, 10).eq("crn_no", 1).eq("sta_no", 1131));
+        List<WrkMast> wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+                .in("io_type", 101, 110).eq("crn_no", 7).eq("sta_no", 1031));
+        if (wrkMastList1.isEmpty() && wrkMastList2.isEmpty()) {
+            List<WrkMast> wrkMastList3 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+                    .in("io_type", 101, 110).eq("crn_no", 1).eq("sta_no", 1135));
+            List<WrkMast> wrkMastList4 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+                    .in("io_type", 1, 10).eq("crn_no", 7).eq("sta_no", 1032));
+            if (!wrkMastList3.isEmpty() || !wrkMastList4.isEmpty()) {
+                if (!config.getValue().equalsIgnoreCase("2")) {
+                    log.info("瀛樺湪璋冩嫧浠诲姟鍘诲洓鍚戝簱,鍒囨崲妯″紡");
+                    config.setValue("2");
+                    configService.updateById(config);
+                }
+            } else {
+                if (!config.getValue().equalsIgnoreCase("0")) {
+                    log.info("涓嶅瓨鍦ㄤ换鍔�");
+                    config.setValue("0");
+                    configService.updateById(config);
+                }
+            }
+        } else {
+            List<WrkMast> wrkMastList3 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+                    .in("io_type", 101, 110).eq("crn_no", 1).eq("sta_no", 1135));
+            List<WrkMast> wrkMastList4 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+                    .in("io_type", 1, 10).eq("crn_no", 7).eq("sta_no", 1032));
+            if (wrkMastList3.isEmpty() && wrkMastList4.isEmpty()) {
+                if (!config.getValue().equalsIgnoreCase("1")) {
+                    log.info("瀛樺湪璋冩嫧浠诲姟鍘籨uiduo,鍒囨崲妯″紡");
+                    config.setValue("1");
+                    configService.updateById(config);
+                }
+            }
+        }
+    }
 }
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 42ba93d..ba737c2 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -55,7 +55,7 @@
             return doOut(wrkMast);
         } else if (wrkMast.getWrkSts() == 108) {
             return doOut2_5(wrkMast);
-        } else if (wrkMast.getWrkSts() == 109) {
+        } else if (wrkMast.getWrkSts() == 106) {
             return doOut2_5(wrkMast);
         }
         return SUCCESS;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4a515da..c82ac48 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -105,7 +105,7 @@
   url: ""
   taskCreatePath: ""
 shuttleWcs:
-  url: "192.168.10.156:9090/rcs"
+  url: 192.168.10.201:9091/rcs
 
 loc-move:
   enable: false
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 56ce2e0..0746e7a 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -63,7 +63,7 @@
     </resultMap>
 
     <select id="selectToBeCompleteData" resultMap="BaseResultMap">
-        select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 Or wrk_sts = 108 Or wrk_sts = 109 ) and io_type != 103 and io_type != 104 and io_type != 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,error_time,io_time,wrk_no
+        select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 Or wrk_sts = 108 Or wrk_sts = 106 ) and io_type != 103 and io_type != 104 and io_type != 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,error_time,io_time,wrk_no
     </select>
 
     <select id="selectToBeHistoryData" resultMap="BaseResultMap">
diff --git a/src/main/webapp/static/js/ioWorks/stockOut.js b/src/main/webapp/static/js/ioWorks/stockOut.js
index 7823220..91877f0 100644
--- a/src/main/webapp/static/js/ioWorks/stockOut.js
+++ b/src/main/webapp/static/js/ioWorks/stockOut.js
@@ -125,6 +125,7 @@
             headers: {'token': localStorage.getItem('token')},
             method: 'POST',
             async: false,
+            data: {},
             success: function (res) {
                 if (res.code === 200){
                     var tpl = $("#takeSiteSelectTemplate").html();
diff --git a/src/main/webapp/static/js/pakStore/emptyOut.js b/src/main/webapp/static/js/pakStore/emptyOut.js
index 8bbc97c..8bc81d4 100644
--- a/src/main/webapp/static/js/pakStore/emptyOut.js
+++ b/src/main/webapp/static/js/pakStore/emptyOut.js
@@ -17,6 +17,7 @@
             headers: {'token': localStorage.getItem('token')},
             method: 'POST',
             async: false,
+            data: {crn_no: 1},
             success: function (res) {
                 if (res.code === 200){
                     var tpl = $("#takeSiteSelectTemplate").html();
@@ -41,7 +42,7 @@
         page: true,
         limit: 16,
         limits: [16, 30, 50, 100, 200, 500],
-        where: {loc_sts: "D"},
+        where: {loc_sts: "D",crn_no: 1},
         even: true,
         toolbar: '#toolbar',
         defaultToolbar: ['filter'],
diff --git a/src/main/webapp/static/js/pakStore/stockOut.js b/src/main/webapp/static/js/pakStore/stockOut.js
index d9b2580..30004c2 100644
--- a/src/main/webapp/static/js/pakStore/stockOut.js
+++ b/src/main/webapp/static/js/pakStore/stockOut.js
@@ -120,6 +120,7 @@
             headers: {'token': localStorage.getItem('token')},
             method: 'POST',
             async: false,
+            data: {"crn_no":1},
             success: function (res) {
                 if (res.code === 200){
                     var tpl = $("#takeSiteSelectTemplate").html();
diff --git a/src/main/webapp/static/js/pakStoreSxk/crnLocCheckOut.js b/src/main/webapp/static/js/pakStoreSxk/crnLocCheckOut.js
new file mode 100644
index 0000000..d3e2768
--- /dev/null
+++ b/src/main/webapp/static/js/pakStoreSxk/crnLocCheckOut.js
@@ -0,0 +1,168 @@
+var locDetlLayerIdx;
+var tableIns;
+var locDetlData = [];
+function getCol() {
+    var cols = [
+        {field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, style: 'font-weight: bold'}
+    ];
+    cols.push.apply(cols, detlCols);
+    return cols;
+}
+
+layui.config({
+    base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin', 'tableMerge'], function() {
+    var table = layui.table;
+    var $ = layui.jquery;
+    var layer = layui.layer;
+    var layDate = layui.laydate;
+    var form = layui.form;
+    var admin = layui.admin;
+    var tableMerge = layui.tableMerge;
+
+    tableIns = table.render({
+        elem: '#chooseData',
+        headers: {token: localStorage.getItem('token')},
+        data: [],
+        even: true,
+        toolbar: '#toolbar',
+        cellMinWidth: 50,
+        cols: [getCol()],
+        done: function(res, curr, count) {
+            tableMerge.render(this);
+            limit();
+            getOutBound();
+            getOutBoundOrder();
+        }
+    });
+
+    // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+    table.on('toolbar(chooseData)', function (obj) {
+        switch (obj.event) {
+            case 'outbound':
+                if (locDetlData.length === 0){
+                    layer.msg('璇峰厛娣诲姞鐩樼偣搴撳瓨', {icon: 2});
+                } else {
+                    var orderNo = $("#orderSelect").val();
+                    if (orderNo === "" || orderNo === null){
+                        layer.msg("璇烽�夋嫨鐩樼偣鍗�", {icon: 2});
+                        return;
+                    }
+                    var staNo = $("#staNoSelect").val();
+                    if (staNo === "" || staNo === null){
+                        layer.msg("璇烽�夋嫨鐩樼偣绔�", {icon: 2});
+                        return;
+                    }
+                    let param = {
+                        outSite: staNo,
+                        locDetls: locDetlData,
+                        orderNo: orderNo
+                    }
+                    $.ajax({
+                        url: baseUrl+"/locCheck/out/start",
+                        headers: {'token': localStorage.getItem('token')},
+                        data: JSON.stringify(param),
+                        contentType:'application/json;charset=UTF-8',
+                        method: 'POST',
+                        success: function (res) {
+                            if (res.code === 200){
+                                locDetlData = [];
+                                tableIns.reload({data: locDetlData});
+                                layer.msg(res.msg, {icon: 1});
+                            } else if (res.code === 403){
+                                top.location.href = baseUrl+"/";
+                            } else {
+                                layer.msg(res.msg, {icon: 2})
+                            }
+                        }
+                    });
+                }
+                break;
+        }
+    });
+
+    // 鑾峰彇鍑哄簱鍙�
+    function getOutBound(){
+        $.ajax({
+            url: baseUrl+"/sxk/available/take/check/site/crn2",
+            headers: {'token': localStorage.getItem('token')},
+            method: 'POST',
+            async: false,
+            success: function (res) {
+                if (res.code === 200){
+                    var tpl = $("#takeSiteSelectTemplate").html();
+                    var template = Handlebars.compile(tpl);
+                    var html = template(res);
+                    $('#staNoSelect').append(html);
+                    form.render('select');
+                } else if (res.code === 403){
+                    top.location.href = baseUrl+"/";
+                }else {
+                    layer.msg(res.msg)
+                }
+            }
+        })
+    }
+
+    // 鑾峰彇鍑哄簱鍙�
+    function getOutBoundOrder(){
+        $.ajax({
+            url: baseUrl+"/inventoryCheckOrder/select/status/1",
+            headers: {'token': localStorage.getItem('token')},
+            method: 'POST',
+            async: false,
+            success: function (res) {
+                if (res.code === 200){
+                    var tpl = $("#orderSelectTemplate").html();
+                    var template = Handlebars.compile(tpl);
+                    var html = template(res);
+                    $('#orderSelect').append(html);
+                    form.render('select');
+                } else if (res.code === 403){
+                    top.location.href = baseUrl+"/";
+                }else {
+                    layer.msg(res.msg)
+                }
+            }
+        })
+    }
+
+    $(document).on('click','#mat-query', function () {
+        let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false});
+        locDetlLayerIdx = layer.open({
+            type: 2,
+            title: false,
+            closeBtn: false,
+            maxmin: false,
+            area: ['90%', '85%'],
+            shadeClose: true,
+            content: 'locDetlCheckQuery.html',
+            success: function(layero, index){
+                layer.close(loadIndex);
+            }
+        });
+    })
+
+})
+
+// 娣诲姞琛ㄦ牸鏁版嵁
+function addTableData(data) {
+    for (let i=0;i<data.length;i++){
+        let pass = false;
+        for (let j=0;j<locDetlData.length;j++){
+            if (data[i].matnr === locDetlData[j].matnr && data[i].batch === locDetlData[j].batch && data[i].locNo$ === locDetlData[j].locNo$) {
+                pass = true;
+                break;
+            }
+        }
+        if (pass) {
+            data.splice(i--, 1);
+        } else {
+            data[i]["count"] = data[i]["anfme"];
+        }
+
+    }
+    locDetlData.push.apply(locDetlData, data);
+    tableIns.reload({data: locDetlData});
+    layer.close(locDetlLayerIdx);
+}
diff --git a/src/main/webapp/static/js/pakStoreSxk/emptyOut.js b/src/main/webapp/static/js/pakStoreSxk/emptyOut.js
new file mode 100644
index 0000000..a4dcee1
--- /dev/null
+++ b/src/main/webapp/static/js/pakStoreSxk/emptyOut.js
@@ -0,0 +1,190 @@
+var pageCurr;
+
+layui.config({
+    base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function() {
+    var table = layui.table;
+    var $ = layui.jquery;
+    var layer = layui.layer;
+    var layDate = layui.laydate;
+    var form = layui.form;
+    var admin = layui.admin;
+
+    // 鑾峰彇鍑哄簱鍙�
+    function getOutBound(){
+        $.ajax({
+            url: baseUrl+"/sxk/available/empty/take/site",
+            headers: {'token': localStorage.getItem('token')},
+            method: 'POST',
+            async: false,
+            data: {crn_no: 1},
+            success: function (res) {
+                if (res.code === 200){
+                    var tpl = $("#takeSiteSelectTemplate").html();
+                    var template = Handlebars.compile(tpl);
+                    var html = template(res);
+                    $('#staNoSelect').append(html);
+                    form.render('select');
+                } else if (res.code === 403){
+                    top.location.href = baseUrl+"/";
+                }else {
+                    layer.msg(res.msg)
+                }
+            }
+        })
+    }
+
+    // 鏁版嵁娓叉煋
+    tableIns = table.render({
+        elem: '#locMast',
+        headers: {token: localStorage.getItem('token')},
+        url: baseUrl+'/locMast/list/auth',
+        page: true,
+        limit: 16,
+        limits: [16, 30, 50, 100, 200, 500],
+        where: {loc_sts: "D",crn_no: 7},
+        even: true,
+        toolbar: '#toolbar',
+        defaultToolbar: ['filter'],
+        cellMinWidth: 50,
+        cols: [[
+            {type: 'checkbox', fixed: 'left'}
+            ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�',sort:true}
+            ,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��',width:200}
+            // ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
+            ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
+            ,{field: 'row1', align: 'center',title: '鎺�'}
+            ,{field: 'bay1', align: 'center',title: '鍒�'}
+            ,{field: 'lev1', align: 'center',title: '灞�'}
+            ,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
+                    var html = "<input value='fullPlt' type='checkbox' disabled=鈥榙isabled鈥� lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
+                    if(row.fullPlt === 'Y'){html += " checked ";}
+                    html += ">";
+                    return html;
+                },width:80}
+            ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',event: 'modiUser'}
+            ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+        ]],
+        request: {
+            pageName: 'curr',
+            pageSize: 'limit'
+        },
+        parseData: function (res) {
+            return {
+                'code': res.code,
+                'msg': res.msg,
+                'count': res.data.total,
+                'data': res.data.records
+            }
+        },
+        response: {
+            statusCode: 200
+        },
+        done: function(res, curr, count) {
+            if (res.code === 403) {
+                top.location.href = baseUrl+"/";
+            }
+            pageCurr=curr;
+            getOutBound();
+            limit();
+            form.on('checkbox(tableCheckbox)', function (data) {
+                var _index = $(data.elem).attr('table-index')||0;
+                if(data.elem.checked){
+                    res.data[_index][data.value] = 'Y';
+                }else{
+                    res.data[_index][data.value] = 'N';
+                }
+            });
+        }
+    });
+
+    // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+    table.on('toolbar(locMast)', function (obj) {
+        var data = table.checkStatus(obj.config.id).data;
+        switch (obj.event) {
+            case 'outbound':
+                var staNo = $("#staNoSelect").val();
+                if (staNo === "" || staNo === null){
+                    layer.msg("璇烽�夋嫨鍑哄簱鍙�");
+                    return;
+                }
+                var locNos = [];
+                data.forEach(function(elem) {
+                    locNos.push(elem.locNo);
+                });
+                if (data.length === 0){
+                    layer.msg('璇疯嚦灏戦�変腑涓�琛屾暟鎹�');
+                } else {
+                    $.ajax({
+                        url: baseUrl+"/empty/plate/out/start",
+                        headers: {'token': localStorage.getItem('token')},
+                        data: {
+                            outSite: staNo,
+                            locNos: locNos
+                        },
+                        method: 'POST',
+                        traditional:true,
+                        success: function (res) {
+                            if (res.code === 200){
+                                tableReload(); // 閲嶈浇琛ㄦ牸
+                                getOutBound(); // 閲嶈浇鍑哄簱鍙�
+                                layer.msg(res.msg);
+                            } else if (res.code === 403){
+                                top.location.href = baseUrl+"/";
+                            } else {
+                                layer.msg(res.msg)
+                            }
+                        }
+                    });
+                }
+                break;
+        }
+    });
+
+    // 鎼滅储鏍忔悳绱簨浠�
+    form.on('submit(search)', function (data) {
+        pageCurr = 1;
+        $('#detlTable').css("display", 'none');
+        tableReload(false);
+        getOutBound();
+    });
+
+    // 鎼滅储鏍忛噸缃簨浠�
+    form.on('submit(reset)', function (data) {
+        pageCurr = 1;
+        clearFormVal($('#search-box'));
+        $('#detlTable').css("display", 'none');
+        tableReload(false);
+        getOutBound();
+    });
+
+})
+
+function tableReload(child) {
+    var searchData = {};
+    $.each($('#search-box [name]').serializeArray(), function() {
+        searchData[this.name] = this.value;
+    });
+    (child ? parent.tableIns : tableIns).reload({
+        where: searchData,
+        page: {
+            curr: pageCurr
+        },
+        done: function (res, curr, count) {
+            if (res.code === 403) {
+                top.location.href = baseUrl+"/";
+            }
+            pageCurr=curr;
+            if (res.data.length === 0 && count !== 0) {
+                tableIns.reload({
+                    where: searchData,
+                    page: {
+                        curr: pageCurr-1
+                    }
+                });
+                pageCurr -= 1;
+            }
+            limit(child);
+        }
+    });
+}
diff --git a/src/main/webapp/static/js/pakStoreSxk/locCheckOut.js b/src/main/webapp/static/js/pakStoreSxk/locCheckOut.js
new file mode 100644
index 0000000..b05f7d1
--- /dev/null
+++ b/src/main/webapp/static/js/pakStoreSxk/locCheckOut.js
@@ -0,0 +1,138 @@
+var locDetlLayerIdx;
+var tableIns;
+var locDetlData = [];
+function getCol() {
+    var cols = [
+        {field: 'locNo', align: 'center',title: '搴撲綅鍙�', style: 'font-weight: bold'}
+    ];
+    cols.push.apply(cols, detlCols);
+    return cols;
+}
+
+layui.config({
+    base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin', 'tableMerge'], function() {
+    var table = layui.table;
+    var $ = layui.jquery;
+    var layer = layui.layer;
+    var layDate = layui.laydate;
+    var form = layui.form;
+    var admin = layui.admin;
+    var tableMerge = layui.tableMerge;
+
+    tableIns = table.render({
+        elem: '#chooseData',
+        headers: {token: localStorage.getItem('token')},
+        data: [],
+        even: true,
+        toolbar: '#toolbar',
+        cellMinWidth: 50,
+        cols: [getCol()],
+        done: function(res, curr, count) {
+            tableMerge.render(this);
+            limit();
+            getOutBound();
+        }
+    });
+
+    // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+    table.on('toolbar(chooseData)', function (obj) {
+        switch (obj.event) {
+            case 'outbound':
+                if (locDetlData.length === 0){
+                    layer.msg('璇峰厛娣诲姞鐩樼偣搴撳瓨', {icon: 2});
+                } else {
+                    var staNo = $("#staNoSelect").val();
+                    if (staNo === "" || staNo === null){
+                        layer.msg("璇烽�夋嫨鐩樼偣绔�", {icon: 2});
+                        return;
+                    }
+                    let param = {
+                        outSite: staNo,
+                        locDetls: locDetlData
+                    }
+                    $.ajax({
+                        url: baseUrl+"/locCheck/out/start/sxk",
+                        headers: {'token': localStorage.getItem('token')},
+                        data: JSON.stringify(param),
+                        contentType:'application/json;charset=UTF-8',
+                        method: 'POST',
+                        success: function (res) {
+                            if (res.code === 200){
+                                locDetlData = [];
+                                tableIns.reload({data: locDetlData});
+                                layer.msg(res.msg, {icon: 1});
+                            } else if (res.code === 403){
+                                top.location.href = baseUrl+"/";
+                            } else {
+                                layer.msg(res.msg, {icon: 2})
+                            }
+                        }
+                    });
+                }
+                break;
+        }
+    });
+
+    // 鑾峰彇鍑哄簱鍙�
+    function getOutBound(){
+        $.ajax({
+            url: baseUrl+"/sxk/available/take/check/site",
+            headers: {'token': localStorage.getItem('token')},
+            method: 'POST',
+            async: false,
+            success: function (res) {
+                if (res.code === 200){
+                    var tpl = $("#takeSiteSelectTemplate").html();
+                    var template = Handlebars.compile(tpl);
+                    var html = template(res);
+                    $('#staNoSelect').append(html);
+                    form.render('select');
+                } else if (res.code === 403){
+                    top.location.href = baseUrl+"/";
+                }else {
+                    layer.msg(res.msg)
+                }
+            }
+        })
+    }
+
+    $(document).on('click','#mat-query', function () {
+        let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false});
+        locDetlLayerIdx = layer.open({
+            type: 2,
+            title: false,
+            closeBtn: false,
+            maxmin: false,
+            area: ['90%', '85%'],
+            shadeClose: true,
+            content: 'locDetlCheckQuery.html',
+            success: function(layero, index){
+                layer.close(loadIndex);
+            }
+        });
+    })
+
+})
+
+// 娣诲姞琛ㄦ牸鏁版嵁
+function addTableData(data) {
+    for (let i=0;i<data.length;i++){
+        let pass = false;
+        for (let j=0;j<locDetlData.length;j++){
+            if (data[i].matnr === locDetlData[j].matnr && data[i].batch === locDetlData[j].batch && data[i].locNo$ === locDetlData[j].locNo$) {
+                pass = true;
+                break;
+            }
+        }
+        if (pass) {
+            data.splice(i--, 1);
+        } else {
+            data[i]["count"] = data[i]["anfme"];
+        }
+
+    }
+    locDetlData.push.apply(locDetlData, data);
+    tableIns.reload({data: locDetlData});
+    layer.close(locDetlLayerIdx);
+}
diff --git a/src/main/webapp/static/js/pakStoreSxk/stockOut.js b/src/main/webapp/static/js/pakStoreSxk/stockOut.js
new file mode 100644
index 0000000..c803e89
--- /dev/null
+++ b/src/main/webapp/static/js/pakStoreSxk/stockOut.js
@@ -0,0 +1,178 @@
+var locDetlLayerIdx;
+var locDetlData = [];
+function getCol() {
+    var cols = [
+        {field: 'count', align: 'center',title: '鍑哄簱鏁伴噺', edit:'text', width: 130,  style:'color: blue;font-weight: bold'}
+        ,{field: 'anfme', align: 'center',title: '搴撳瓨鏁伴噺'}
+        ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+    ];
+    arrRemove(detlCols,  'field', 'anfme');
+    cols.push.apply(cols, detlCols);
+    cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 80})
+    return cols;
+}
+
+layui.config({
+    base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function() {
+    var table = layui.table;
+    var $ = layui.jquery;
+    var layer = layui.layer;
+    var form = layui.form;
+    var admin = layui.admin;
+
+    tableIns = table.render({
+        elem: '#chooseData',
+        headers: {token: localStorage.getItem('token')},
+        data: [],
+        even: true,
+        toolbar: '#toolbar',
+        cellMinWidth: 50,
+        limit: 500,
+        cols: [getCol()],
+        done: function(res, curr, count) {
+            limit();
+            getOutBound();
+        }
+    });
+
+    // 椤甸潰淇敼
+    table.on('edit(chooseData)', function (obj) {
+        let index = obj.tr.attr("data-index");
+        let data = locDetlData[index];
+        let modify = true;
+        if (obj.field === 'count'){
+            let vle = Number(obj.value);
+            if (isNaN(vle)) {
+                layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2});
+                modify = false;
+            } else {
+                if (vle <= 0) {
+                    layer.msg("鏁伴噺蹇呴』澶т簬闆�", {icon: 2});
+                    modify = false;
+                }
+                if (vle > Number(data.anfme)) {
+                    layer.msg("鍑哄簱鏁伴噺涓嶅緱澶т簬搴撳瓨鏁伴噺", {icon: 2});
+                    modify = false;
+                }
+            }
+        }
+        if (modify) {
+            data[obj.field] = obj.value;
+        }
+        tableIns.reload({data: locDetlData});
+    });
+
+    // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+    table.on('toolbar(chooseData)', function (obj) {
+        switch (obj.event) {
+            case 'outbound':
+                if (locDetlData.length === 0){
+                    layer.msg('璇峰厛鎻愬彇鍟嗗搧搴撳瓨', {icon: 2});
+                } else {
+                    var staNo = $("#staNoSelect").val();
+                    if (staNo === "" || staNo === null){
+                        layer.msg("璇烽�夋嫨鍑哄簱鍙�", {icon: 2});
+                        return;
+                    }
+                    let param = {
+                        outSite: staNo,
+                        locDetls: locDetlData
+                    }
+                    $.ajax({
+                        url: baseUrl+"/plate/out/start",
+                        headers: {'token': localStorage.getItem('token')},
+                        data: JSON.stringify(param),
+                        contentType:'application/json;charset=UTF-8',
+                        method: 'POST',
+                        success: function (res) {
+                            if (res.code === 200){
+                                locDetlData = [];
+                                tableIns.reload({data: locDetlData,done:function (res) {limit();getOutBound();}});
+                                layer.msg(res.msg, {icon: 1});
+                            } else if (res.code === 403){
+                                top.location.href = baseUrl+"/";
+                            } else {
+                                layer.msg(res.msg, {icon: 2})
+                            }
+                        }
+                    });
+                }
+                break;
+        }
+    });
+
+    // 鐩戝惉琛屽伐鍏蜂簨浠�
+    table.on('tool(chooseData)', function(obj){
+        switch (obj.event) {
+            case 'remove':
+                let index = obj.tr.attr("data-index");
+                locDetlData.splice(index, 1);
+                tableIns.reload({data: locDetlData});
+                break;
+        }
+    });
+
+    // 鑾峰彇鍑哄簱鍙�
+    function getOutBound(){
+        $.ajax({
+            url: baseUrl+"/sxk/available/take/site",
+            headers: {'token': localStorage.getItem('token')},
+            method: 'POST',
+            async: false,
+            data: {"crn_no":7},
+            success: function (res) {
+                if (res.code === 200){
+                    var tpl = $("#takeSiteSelectTemplate").html();
+                    var template = Handlebars.compile(tpl);
+                    var html = template(res);
+                    $('#staNoSelect').append(html);
+                    form.render('select');
+                } else if (res.code === 403){
+                    top.location.href = baseUrl+"/";
+                }else {
+                    layer.msg(res.msg)
+                }
+            }
+        })
+    }
+
+
+    $(document).on('click','#mat-query', function () {
+        let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false});
+        locDetlLayerIdx = layer.open({
+            type: 2,
+            title: false,
+            closeBtn: false,
+            maxmin: false,
+            area: ['90%', '85%'],
+            shadeClose: true,
+            content: 'locDetlQuery.html',
+            success: function(layero, index){
+                layer.close(loadIndex);
+            }
+        });
+    })
+
+})
+
+// 娣诲姞琛ㄦ牸鏁版嵁
+function addTableData(data) {
+    for (var i=0;i<data.length;i++){
+        let pass = false;
+        for (var j=0;j<locDetlData.length;j++){
+            if (data[i].matnr === locDetlData[j].matnr && data[i].batch === locDetlData[j].batch && data[i].locNo$ === locDetlData[j].locNo$) {
+                pass = true;
+                break;
+            }
+        }
+        if (pass) {
+            data.splice(i--, 1);
+        } else {
+            data[i]["count"] = data[i]["anfme"];
+        }
+    }
+    locDetlData.push.apply(locDetlData, data);
+    tableIns.reload({data: locDetlData});
+    layer.close(locDetlLayerIdx);
+}
diff --git a/src/main/webapp/views/pakStore/emptyOut.html b/src/main/webapp/views/pakStore/emptyOut.html
index 21a8e72..c733166 100644
--- a/src/main/webapp/views/pakStore/emptyOut.html
+++ b/src/main/webapp/views/pakStore/emptyOut.html
@@ -94,11 +94,7 @@
             <input class="layui-input" type="text" name="lev1" placeholder="灞�" lay-verify="number" autocomplete="off">
         </div>
     </div>
-    <div class="layui-inline">
-        <div class="layui-input-inline">
-            <input class="layui-input" type="text" name="crn_no" placeholder="鍫嗗灈鏈哄彿" lay-verify="number" autocomplete="off">
-        </div>
-    </div>
+
 
     <!-- 寰呮坊鍔� -->
     <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index f08e299..80be16c 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -46,17 +46,17 @@
     <legend>鎼滅储鏍�</legend>
     <!-- 鎼滅储鏍� -->
     <div id="search-box" class="layui-form layui-card-header">
-        <div class="layui-inline">
-            <div class="layui-input-inline cool-auto-complete">
-                <input id="crnNo" class="layui-input" name="crnNo" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
-                <input id="crnNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="鍫嗗灈鏈哄彿" onfocus=this.blur()>
-                <div class="cool-auto-complete-window">
-                    <input class="cool-auto-complete-window-input" data-key="basCrnpQueryBycrnNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
-                    <select class="cool-auto-complete-window-select" data-key="basCrnpQueryBycrnNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
-                    </select>
-                </div>
-            </div>
-        </div>
+<!--        <div class="layui-inline">-->
+<!--            <div class="layui-input-inline cool-auto-complete">-->
+<!--                <input id="crnNo" class="layui-input" name="crnNo" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">-->
+<!--                <input id="crnNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="鍫嗗灈鏈哄彿" onfocus=this.blur()>-->
+<!--                <div class="cool-auto-complete-window">-->
+<!--                    <input class="cool-auto-complete-window-input" data-key="basCrnpQueryBycrnNo" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!--                    <select class="cool-auto-complete-window-select" data-key="basCrnpQueryBycrnNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!--                    </select>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
         <div class="layui-inline">
             <div class="layui-input-inline">
                 <input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">
@@ -136,11 +136,12 @@
         locDetlTableIns = table.render({
             elem: '#stockOut',
             headers: {token: localStorage.getItem('token')},
-            url: baseUrl+'/stock/out/list/auth',
+            url: baseUrl+'/stock/out/crn/list/auth',
             page: true,
             limits: [16, 30, 50, 100, 200, 500],
             limit: 16,
             even: true,
+            where: {"crn_no":1},
             toolbar: '#toolbar',
             cellMinWidth: 50,
             cols: [getCol()],
@@ -199,6 +200,7 @@
         $.each($('#search-box [name]').serializeArray(), function() {
             searchData[this.name] = this.value;
         });
+        searchData["crn_no"] = 1;
         locDetlTableIns.reload({
             where: searchData,
         });
diff --git a/src/main/webapp/views/pakStoreSxk/crnLocCheckOut.html b/src/main/webapp/views/pakStoreSxk/crnLocCheckOut.html
new file mode 100644
index 0000000..80c8bd4
--- /dev/null
+++ b/src/main/webapp/views/pakStoreSxk/crnLocCheckOut.html
@@ -0,0 +1,148 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+    <link rel="stylesheet" href="../../static/css/common.css" media="all">
+    <style>
+        html {
+            height: 100%;
+            padding: 10px;
+            background-color: #f1f1f1;
+            box-sizing: border-box;
+        }
+        body {
+            background-color: #fff;
+            border-radius: 5px;
+            box-shadow: 0 0 3px rgba(0,0,0,.3);
+        }
+        #orderSpan {
+            text-align: center;
+            display: inline-block;
+            width: 100px;
+            font-size: 13px;
+        }
+        #staNoSpan {
+            text-align: center;
+            display: inline-block;
+            width: 100px;
+            font-size: 13px;
+        }
+        .layui-btn-container .layui-form-select {
+            display: inline-block;
+            width: 150px;
+            height: 30px;
+        }
+        .layui-btn-container .layui-form-select.layui-form-selected {
+            display: inline-block;
+            width: 150px;
+        }
+        .layui-btn-container .layui-select-title input {
+            font-size: 13px;
+        }
+        .layui-btn-container .layui-anim.layui-anim-upbit dd {
+            font-size: 13px;
+        }
+
+        #btn-outbound {
+            margin-left: 60px;
+        }
+
+        /*----------------------------------*/
+        .function-area {
+            padding: 20px 50px;
+        }
+        .function-btn {
+            font-size: 16px;
+            padding: 1px 2px;
+            width: 100px;
+            height: 50px;
+            border-color: #2b425b;
+            border-radius: 4px;
+            border-width: 2px;
+            background: none;
+            border-style: solid;
+            transition: 0.4s;
+            cursor: pointer;
+            letter-spacing: 1.5px;
+        }
+        .function-btn:hover {
+            background-color: #2b425b;
+            color: #fff;
+        }
+
+        #mat-query {
+            display: none;
+        }
+        #btn-outbound {
+            display: none;
+        }
+    </style>
+</head>
+<body style="padding-bottom: 30px">
+
+<!-- 鍔熻兘鍖� -->
+<div class="function-area">
+    <button id="mat-query" class="function-btn">鎻愬彇搴撳瓨</button>
+</div>
+
+<hr>
+
+<!-- 琛ㄦ牸 -->
+<div style="padding-bottom: 5px; margin-bottom: 45px">
+
+    <!-- 澶撮儴 -->
+    <script type="text/html" id="toolbar">
+        <div class="layui-form">
+            <div class="layui-btn-container">
+                <span id="orderSpan">鐩樼偣鍗曪細</span>
+                <select id="orderSelect" lay-verify="required">
+                    <option value="">璇烽�夋嫨鍗曟嵁</option>
+                </select>
+                <!-- 1.閫夋嫨鍑哄簱鍙� -->
+                <span id="staNoSpan">鐩樼偣绔欙細</span>
+                <select id="staNoSelect" lay-verify="required">
+                    <option value="">璇烽�夋嫨绔欑偣</option>
+                </select>
+                <!-- 2.鍚姩鍑哄簱 -->
+                <button class="layui-btn layui-btn-lg" id="btn-outbound" lay-event="outbound">鐩樼偣鍑哄簱</button>
+            </div>
+        </div>
+    </script>
+
+    <!-- 琛� -->
+    <script type="text/html" id="operate">
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="remove">绉婚櫎</a>
+    </script>
+
+    <table class="layui-table" id="chooseData" lay-filter="chooseData"></table>
+</div>
+
+<script type="text/template" id="takeSiteSelectTemplate">
+    {{#each data}}
+    <option value="{{stnNo}}">{{stnNo}}</option>
+    {{/each}}
+</script>
+
+<script type="text/template" id="orderSelectTemplate">
+    {{#each data}}
+    <option value="{{orderNo}}">{{orderNo}}</option>
+    {{/each}}
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
+<script type="text/javascript" src="../../static/js/pakStoreSxk/crnLocCheckOut.js" charset="utf-8"></script>
+
+</body>
+</html>
+
diff --git a/src/main/webapp/views/pakStoreSxk/emptyOut.html b/src/main/webapp/views/pakStoreSxk/emptyOut.html
new file mode 100644
index 0000000..b7a008b
--- /dev/null
+++ b/src/main/webapp/views/pakStoreSxk/emptyOut.html
@@ -0,0 +1,142 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+    <link rel="stylesheet" href="../../static/css/common.css" media="all">
+    <style>
+        html {
+            height: 100%;
+            padding: 10px;
+            background-color: #f1f1f1;
+            box-sizing: border-box;
+        }
+        body {
+            background-color: #fff;
+            border-radius: 5px;
+            box-shadow: 0 0 3px rgba(0,0,0,.3);
+            padding-bottom: 20px;
+        }
+        #search-box {
+            padding: 30px 0 20px 0;
+        }
+        #search-box .layui-inline:first-child {
+            margin-left: 30px;
+        }
+        #search-box .layui-inline {
+            margin-right: 5px;
+        }
+
+        #data-search-btn {
+            margin-left: 10px;
+            display: inline-block;
+        }
+        #data-search-btn.layui-btn-container .layui-btn {
+            margin-right: 20px;
+        }
+
+        #staNoSpan {
+            text-align: center;
+            display: inline-block;
+            width: 100px;
+            font-size: 13px;
+        }
+        .layui-btn-container .layui-form-select {
+            display: inline-block;
+            width: 150px;
+            height: 30px;
+        }
+        .layui-btn-container .layui-form-select.layui-form-selected {
+            display: inline-block;
+            width: 150px;
+        }
+        .layui-btn-container .layui-select-title input {
+            font-size: 13px;
+        }
+        .layui-btn-container .layui-anim.layui-anim-upbit dd {
+            font-size: 13px;
+        }
+
+        #btn-outbound {
+            margin-left: 60px;
+            display: none;
+        }
+
+    </style>
+</head>
+<body>
+
+<!-- 鎼滅储鏍� -->
+<div id="search-box" class="layui-form layui-card-header">
+    <div class="layui-inline">
+        <div class="layui-input-inline">
+            <input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">
+        </div>
+    </div>
+    <div class="layui-inline">
+        <div class="layui-input-inline">
+            <input class="layui-input" type="text" name="row1" placeholder="鎺�" lay-verify="number"  autocomplete="off">
+        </div>
+    </div>
+    <div class="layui-inline">
+        <div class="layui-input-inline">
+            <input class="layui-input" type="text" name="bay1" placeholder="鍒�" lay-verify="number" autocomplete="off">
+        </div>
+    </div>
+    <div class="layui-inline">
+        <div class="layui-input-inline">
+            <input class="layui-input" type="text" name="lev1" placeholder="灞�" lay-verify="number" autocomplete="off">
+        </div>
+    </div>
+
+
+    <!-- 寰呮坊鍔� -->
+    <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
+        <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
+        <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
+    </div>
+</div>
+
+<script type="text/html" id="toolbar">
+    <div class="layui-form">
+        <div class="layui-btn-container">
+            <!-- 1.閫夋嫨鍑哄簱鍙� -->
+            <span id="staNoSpan">绌烘澘鍑哄簱鍙ｏ細</span>
+            <select id="staNoSelect" lay-verify="required">
+                <option value="">璇烽�夋嫨绔欑偣</option>
+            </select>
+            <!-- 2.鍚姩鍑哄簱 -->
+            <button class="layui-btn layui-btn-lg" id="btn-outbound" lay-event="outbound">鍚姩鍑哄簱</button>
+        </div>
+    </div>
+</script>
+
+<!-- 绌烘澘搴撲綅琛� -->
+<table class="layui-hide" id="locMast" lay-filter="locMast"></table>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
+<script type="text/javascript" src="../../static/js/pakStoreSxk/emptyOut.js" charset="utf-8"></script>
+
+<!--鍚姩鍑哄簱-->
+<div id="outboundDiv">
+
+</div>
+
+<script type="text/template" id="takeSiteSelectTemplate">
+    {{#each data}}
+    <option value="{{siteId}}">{{desc}}</option>
+    {{/each}}
+</script>
+</body>
+</html>
+
diff --git a/src/main/webapp/views/pakStoreSxk/locCheckOut.html b/src/main/webapp/views/pakStoreSxk/locCheckOut.html
new file mode 100644
index 0000000..6d90ebb
--- /dev/null
+++ b/src/main/webapp/views/pakStoreSxk/locCheckOut.html
@@ -0,0 +1,132 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+    <link rel="stylesheet" href="../../static/css/common.css" media="all">
+    <style>
+        html {
+            height: 100%;
+            padding: 10px;
+            background-color: #f1f1f1;
+            box-sizing: border-box;
+        }
+        body {
+            background-color: #fff;
+            border-radius: 5px;
+            box-shadow: 0 0 3px rgba(0,0,0,.3);
+        }
+        #staNoSpan {
+            text-align: center;
+            display: inline-block;
+            width: 100px;
+            font-size: 13px;
+        }
+        .layui-btn-container .layui-form-select {
+            display: inline-block;
+            width: 150px;
+            height: 30px;
+        }
+        .layui-btn-container .layui-form-select.layui-form-selected {
+            display: inline-block;
+            width: 150px;
+        }
+        .layui-btn-container .layui-select-title input {
+            font-size: 13px;
+        }
+        .layui-btn-container .layui-anim.layui-anim-upbit dd {
+            font-size: 13px;
+        }
+
+        #btn-outbound {
+            margin-left: 60px;
+        }
+
+        /*----------------------------------*/
+        .function-area {
+            padding: 20px 50px;
+        }
+        .function-btn {
+            font-size: 16px;
+            padding: 1px 2px;
+            width: 100px;
+            height: 50px;
+            border-color: #2b425b;
+            border-radius: 4px;
+            border-width: 2px;
+            background: none;
+            border-style: solid;
+            transition: 0.4s;
+            cursor: pointer;
+            letter-spacing: 1.5px;
+        }
+        .function-btn:hover {
+            background-color: #2b425b;
+            color: #fff;
+        }
+
+        #mat-query {
+            display: none;
+        }
+        #btn-outbound {
+            display: none;
+        }
+    </style>
+</head>
+<body style="padding-bottom: 30px">
+
+<!-- 鍔熻兘鍖� -->
+<div class="function-area">
+    <button id="mat-query" class="function-btn">鎻愬彇搴撳瓨</button>
+</div>
+
+<hr>
+
+<!-- 琛ㄦ牸 -->
+<div style="padding-bottom: 5px; margin-bottom: 45px">
+
+    <!-- 澶撮儴 -->
+    <script type="text/html" id="toolbar">
+        <div class="layui-form">
+            <div class="layui-btn-container">
+                <!-- 1.閫夋嫨鍑哄簱鍙� -->
+                <span id="staNoSpan">鐩樼偣绔欙細</span>
+                <select id="staNoSelect" lay-verify="required">
+                    <option value="">璇烽�夋嫨绔欑偣</option>
+                </select>
+                <!-- 2.鍚姩鍑哄簱 -->
+                <button class="layui-btn layui-btn-lg" id="btn-outbound" lay-event="outbound">鐩樼偣鍑哄簱</button>
+            </div>
+        </div>
+    </script>
+
+    <!-- 琛� -->
+    <script type="text/html" id="operate">
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="remove">绉婚櫎</a>
+    </script>
+
+    <table class="layui-table" id="chooseData" lay-filter="chooseData"></table>
+</div>
+
+<script type="text/template" id="takeSiteSelectTemplate">
+    {{#each data}}
+    <option value="{{this}}">{{this}}</option>
+    {{/each}}
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
+<script type="text/javascript" src="../../static/js/pakStoreSxk/locCheckOut.js" charset="utf-8"></script>
+
+</body>
+</html>
+
diff --git a/src/main/webapp/views/pakStoreSxk/locDetlCheckQuery.html b/src/main/webapp/views/pakStoreSxk/locDetlCheckQuery.html
new file mode 100644
index 0000000..0e71897
--- /dev/null
+++ b/src/main/webapp/views/pakStoreSxk/locDetlCheckQuery.html
@@ -0,0 +1,238 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+    <link rel="stylesheet" href="../../static/css/common.css" media="all">
+    <style>
+        body {
+            padding: 0 20px;
+        }
+        .layui-table-box {
+            border-right: 1px solid #9F9F9F;
+            border-left: 1px solid #9F9F9F;
+        }
+
+        #search-box {
+            padding: 30px 0 20px 0;
+        }
+        #search-box .layui-inline:first-child {
+            margin-left: 30px;
+        }
+        #search-box .layui-inline {
+            margin-right: 5px;
+        }
+
+        #data-search-btn {
+            margin-left: 10px;
+            display: inline-block;
+        }
+        #data-search-btn.layui-btn-container .layui-btn {
+            margin-right: 20px;
+        }
+
+    </style>
+</head>
+<body>
+
+<!-- 鎼滅储鏍� -->
+<fieldset class="layui-elem-field site-demo-button" style="margin: 20px;">
+    <legend>鎼滅储鏍�</legend>
+    <!-- 鎼滅储鏍� -->
+    <div id="search-box" class="layui-form layui-card-header">
+<!--        <div class="layui-input-inline" style="margin-top: -10px">-->
+<!--            <select id="crnNo" name="crnNo">-->
+<!--                <option value="" style="display: none">璇烽�夋嫨宸烽亾</option>-->
+<!--                <option value="1">1鍙�</option>-->
+<!--                <option value="2">2鍙�</option>-->
+<!--                <option value="3">3鍙�</option>-->
+<!--                <option value="4">4鍙�</option>-->
+<!--            </select>-->
+<!--        </div>-->
+        <div class="layui-inline">
+            <div class="layui-input-inline cool-auto-complete">
+                <input id="crnNo" class="layui-input" name="crnNo" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
+                <input id="crnNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="鍫嗗灈鏈哄彿" onfocus=this.blur()>
+                <div class="cool-auto-complete-window">
+                    <input class="cool-auto-complete-window-input" data-key="basCrnpQueryBycrnNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
+                    <select class="cool-auto-complete-window-select" data-key="basCrnpQueryBycrnNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+                    </select>
+                </div>
+            </div>
+        </div>
+        <div class="layui-inline">
+            <div class="layui-input-inline">
+                <input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <div class="layui-input-inline">
+                <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿"  autocomplete="off">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <div class="layui-input-inline">
+                <input class="layui-input" type="text" name="specs" placeholder="瑙勬牸"  autocomplete="off">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <div class="layui-input-inline">
+                <input class="layui-input" type="text" name="maktx" placeholder="鐗╂枡鎻忚堪" autocomplete="off">
+            </div>
+        </div>
+        <!-- 鏃ユ湡鑼冨洿 -->
+        <div class="layui-inline" style="width: 300px">
+            <div class="layui-input-inline">
+                <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+            </div>
+        </div>
+        <!-- 寰呮坊鍔� -->
+        <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
+            <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
+            <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
+        </div>
+    </div>
+</fieldset>
+
+<script type="text/html" id="toolbar">
+    <div class="layui-btn-container">
+        <button class="layui-btn" id="btn-confirm" lay-event="confirm" style="">鎻愬彇</button>
+    </div>
+</script>
+
+<div class="layui-form">
+    <table class="layui-hide" id="stockOut" lay-filter="stockOut"></table>
+</div>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
+
+</body>
+<script>
+
+    function getCol() {
+        let cols = [
+            {type: 'checkbox', merge: ['locNo']}
+            ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, style: 'font-weight: bold'}
+        ];
+        cols.push.apply(cols, detlCols);
+        cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
+            ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'})
+        return cols;
+    }
+
+    layui.config({
+        base: baseUrl + "/static/layui/lay/modules/"
+    }).use(['table','laydate', 'form', 'admin', 'tableMerge'], function() {
+        var table = layui.table;
+        var $ = layui.jquery;
+        var layer = layui.layer;
+        var layDate = layui.laydate;
+        var form = layui.form;
+        var admin = layui.admin;
+        var tableMerge = layui.tableMerge;
+
+        // 鏁版嵁娓叉煋
+        locDetlTableIns = table.render({
+            elem: '#stockOut',
+            headers: {token: localStorage.getItem('token')},
+            url: baseUrl+'/stock/out/list/auth',
+            page: true,
+            limit: 20,
+            limits: [20, 50, 100, 200, 500],
+            even: true,
+            toolbar: '#toolbar',
+            cellMinWidth: 50,
+            cols: [getCol()],
+            request: {
+                pageName: 'curr',
+                pageSize: 'limit'
+            },
+            parseData: function (res) {
+                return {
+                    'code': res.code,
+                    'msg': res.msg,
+                    'count': res.data.total,
+                    'data': res.data.records
+                }
+            },
+            response: {
+                statusCode: 200
+            },
+            done: function(res, curr, count) {
+                tableMerge.render(this);
+                if (res.code === 403) {
+                    top.location.href = baseUrl+"/";
+                }
+            }
+        });
+
+        // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(stockOut)', function (obj) {
+            var checkStatus = table.checkStatus(obj.config.id);
+            var data = checkStatus.data;
+            switch(obj.event) {
+                case 'confirm':
+                    if (data.length === 0){
+                        layer.msg("璇烽�夋嫨鏁版嵁", {icon: 2});
+                        return;
+                    }
+                    let locNos = [];
+                    data.forEach(function(elem) {
+                        locNos.push(elem.locNo);
+                    });
+                    $.ajax({
+                        url: baseUrl+"/locDetl/auth",
+                        headers: {'token': localStorage.getItem('token')},
+                        data: {locNos:locNos},
+                        method: 'POST',
+                        async: false,
+                        success: function (res) {
+                            if (res.code === 200) {
+                                data = res.data;
+                            } else if (res.code === 403) {
+                                top.location.href = baseUrl + "/";
+                            } else {
+                                layer.msg(res.msg)
+                            }
+                        }
+                    })
+                    parent.addTableData(data);
+                    break;
+            }
+        });
+
+        // 鎼滅储鏍忔悳绱簨浠�
+        form.on('submit(search)', function (data) {
+            tableReload();
+        });
+
+        layDate.render({
+            elem: '.layui-laydate-range'
+            ,type: 'datetime'
+            ,range: true
+        });
+    })
+
+    function tableReload() {
+        var searchData = {};
+        $.each($('#search-box [name]').serializeArray(), function() {
+            searchData[this.name] = this.value;
+        });
+        locDetlTableIns.reload({
+            where: searchData
+        });
+    }
+
+</script>
+</html>
+
diff --git a/src/main/webapp/views/pakStoreSxk/locDetlQuery.html b/src/main/webapp/views/pakStoreSxk/locDetlQuery.html
new file mode 100644
index 0000000..af3a5e2
--- /dev/null
+++ b/src/main/webapp/views/pakStoreSxk/locDetlQuery.html
@@ -0,0 +1,210 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+    <link rel="stylesheet" href="../../static/css/common.css" media="all">
+    <style>
+        body {
+        }
+        .layui-table-box {
+            border-right: 1px solid #9F9F9F;
+            border-left: 1px solid #9F9F9F;
+        }
+
+        #search-box {
+            padding: 30px 0 20px 0;
+        }
+        #search-box .layui-inline:first-child {
+            margin-left: 30px;
+        }
+        #search-box .layui-inline {
+            margin-right: 5px;
+        }
+
+        #data-search-btn {
+            margin-left: 10px;
+            display: inline-block;
+        }
+        #data-search-btn.layui-btn-container .layui-btn {
+            margin-right: 20px;
+        }
+    </style>
+</head>
+<body>
+<div style="padding: 25px; line-height: 22px; background-color: #393D49; color: #fff; font-weight: 300;">
+    <span style="font-size: large; font-weight: bold">鎻愬彇搴撳瓨鍟嗗搧</span>
+</div>
+<!-- 鎼滅储鏍� -->
+<fieldset class="layui-elem-field site-demo-button" style="margin: 20px;">
+    <legend>鎼滅储鏍�</legend>
+    <!-- 鎼滅储鏍� -->
+    <div id="search-box" class="layui-form layui-card-header">
+<!--        <div class="layui-inline">-->
+<!--            <div class="layui-input-inline cool-auto-complete">-->
+<!--                <input id="crnNo" class="layui-input" name="crnNo" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">-->
+<!--                <input id="crnNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="鍫嗗灈鏈哄彿" onfocus=this.blur()>-->
+<!--                <div class="cool-auto-complete-window">-->
+<!--                    <input class="cool-auto-complete-window-input" data-key="basCrnpQueryBycrnNo" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!--                    <select class="cool-auto-complete-window-select" data-key="basCrnpQueryBycrnNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!--                    </select>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
+        <div class="layui-inline">
+            <div class="layui-input-inline">
+                <input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <div class="layui-input-inline">
+                <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿"  autocomplete="off">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <div class="layui-input-inline">
+                <input class="layui-input" type="text" name="specs" placeholder="瑙勬牸"  autocomplete="off">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <div class="layui-input-inline">
+                <input class="layui-input" type="text" name="maktx" placeholder="鐗╂枡鎻忚堪" autocomplete="off">
+            </div>
+        </div>
+        <!-- 鏃ユ湡鑼冨洿 -->
+        <div class="layui-inline" style="width: 300px">
+            <div class="layui-input-inline">
+                <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+            </div>
+        </div>
+        <!-- 寰呮坊鍔� -->
+        <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
+            <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
+        </div>
+    </div>
+</fieldset>
+
+<script type="text/html" id="toolbar">
+    <div class="layui-btn-container">
+        <button class="layui-btn" id="btn-confirm" lay-event="confirm" style="">鎻愬彇</button>
+    </div>
+</script>
+
+<div class="layui-form">
+    <table class="layui-hide" id="stockOut" lay-filter="stockOut"></table>
+</div>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
+
+</body>
+<script>
+
+    function getCol() {
+        var cols = [
+            {type: 'checkbox'}
+            ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, style: 'font-weight: bold'}
+            // ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+        ];
+        cols.push.apply(cols, detlCols);
+        cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
+            ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'})
+        return cols;
+    }
+
+    layui.config({
+        base: baseUrl + "/static/layui/lay/modules/"
+    }).use(['table','laydate', 'form', 'admin', 'tableMerge'], function() {
+        var table = layui.table;
+        var $ = layui.jquery;
+        var layer = layui.layer;
+        var layDate = layui.laydate;
+        var form = layui.form;
+        var admin = layui.admin;
+        var tableMerge = layui.tableMerge;
+
+        // 鏁版嵁娓叉煋
+        locDetlTableIns = table.render({
+            elem: '#stockOut',
+            headers: {token: localStorage.getItem('token')},
+            url: baseUrl+'/stock/out/crn/list/auth',
+            page: true,
+            limits: [16, 30, 50, 100, 200, 500],
+            limit: 16,
+            even: true,
+            where: {"crn_no":7},
+            toolbar: '#toolbar',
+            cellMinWidth: 50,
+            cols: [getCol()],
+            request: {
+                pageName: 'curr',
+                pageSize: 'limit'
+            },
+            parseData: function (res) {
+                return {
+                    'code': res.code,
+                    'msg': res.msg,
+                    'count': res.data.total,
+                    'data': res.data.records
+                }
+            },
+            response: {
+                statusCode: 200
+            },
+            done: function(res, curr, count) {
+                tableMerge.render(this);
+                if (res.code === 403) {
+                    top.location.href = baseUrl+"/";
+                }
+            }
+        });
+
+        // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(stockOut)', function (obj) {
+            var checkStatus = table.checkStatus(obj.config.id);
+            var data = checkStatus.data;
+            switch(obj.event) {
+                case 'confirm':
+                    if (data.length === 0){
+                        layer.msg("璇烽�夋嫨鏁版嵁");
+                        return;
+                    }
+                    parent.addTableData(data);
+                    break;
+            }
+        });
+
+        // 鎼滅储鏍忔悳绱簨浠�
+        form.on('submit(search)', function (data) {
+            tableReload();
+        });
+
+        layDate.render({
+            elem: '.layui-laydate-range'
+            ,type: 'datetime'
+            ,range: true
+        });
+    })
+
+    function tableReload() {
+        var searchData = {};
+        $.each($('#search-box [name]').serializeArray(), function() {
+            searchData[this.name] = this.value;
+        });
+        searchData["crn_no"] = 7;
+        locDetlTableIns.reload({
+            where: searchData,
+        });
+    }
+</script>
+</html>
+
diff --git a/src/main/webapp/views/pakStoreSxk/locMove.html b/src/main/webapp/views/pakStoreSxk/locMove.html
new file mode 100644
index 0000000..7a854da
--- /dev/null
+++ b/src/main/webapp/views/pakStoreSxk/locMove.html
@@ -0,0 +1,130 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+    <link rel="stylesheet" href="../../static/css/common.css" media="all">
+    <style>
+        html {
+            height: 100%;
+            padding: 10px;
+            background-color: #f1f1f1;
+            box-sizing: border-box;
+        }
+        body {
+            background-color: #fff;
+            border-radius: 5px;
+            box-shadow: 0 0 3px rgba(0,0,0,.3);
+            padding-bottom: 20px;
+        }
+        .function-area {
+            padding: 50px 80px 50px 70px;
+            display: inline-block;
+        }
+        .cool-auto-complete-div {
+            height: 40px;
+            border-radius: 5px;
+            border: 1px solid #b8b8b8;
+            color: #888;
+            box-shadow: inset 0 1px 2px #ECECEC;
+            -moz-box-shadow: inset 0 1px 2px #ECECEC;
+            -webkit-box-shadow: inset 0 1px 2px #ECECEC;
+        }
+
+        .function-btn {
+            margin-left: 15px;
+            background: #E27575;
+            border: none;
+            padding: 10px 25px 10px 25px;
+            color: #FFF;
+            box-shadow: 1px 1px 5px #B6B6B6;
+            border-radius: 3px;
+            text-shadow: 1px 1px 1px #9E3F3F;
+            cursor: pointer;
+        }
+        .function-btn:hover {
+            opacity: 0.8
+        }
+
+        .layui-layer-lan .layui-layer-btn a {
+            background: #4476A7;
+            border-color: #4476A7;
+            color: #fff;
+        }
+        .layui-layer-lan .layui-layer-btn .layui-layer-btn1 {
+            background: #fff;
+            color: #333;
+            border-color: #E9E7E7;
+        }
+        .layui-layer-lan .layui-layer-btn .layui-layer-btn1:hover {
+            background-color: #f7f7f7;
+        }
+
+        #loc-move-btn {
+            display: none;
+        }
+    </style>
+</head>
+<body>
+
+<div class="function-area layui-form">
+    <!-- 婧愬簱浣� -->
+    <div class="layui-inline">
+        <div class="layui-input-inline">
+            <input id="sourceLocNo" class="layui-input" onkeyup="getLoc(this)" type="text" placeholder="婧愬簱浣�" autocomplete="off">
+        </div>
+    </div>
+    <div class="layui-form-mid" style="float: none; display: inline-block; margin-left: 10px">-</div>
+    <div class="layui-input-inline">
+        <select id="targetLocNo" name="modules" lay-verify="required" lay-search="">
+            <option value="">鐩爣绌哄簱浣�</option>
+        </select>
+    </div>
+    <button id="loc-move-btn" class="function-btn" onclick="locMove()" style="background: #4476A7;text-shadow: inherit;height: 45px;font-size: 15px;margin-left: 20px">搴撲綅绉昏浆</button>
+</div>
+
+<hr>
+
+<table class="layui-table" id="locMatCode" lay-filter="locMatCode"></table>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
+<script type="text/javascript" src="../../static/js/pakStoreSxk/locMove.js" charset="utf-8"></script>
+
+<script type="text/template" id="emptyLocStock">
+    <option value="">璇疯緭鍏ュ苟閫夋嫨</option>
+    {{#each data}}
+    <option value="{{this}}">{{this}}</option>
+    {{/each}}
+</script>
+
+<div id="locMoveWindow" style="height: 100%;display: none">
+    <div style="float: left;width: 35%;height: 100%">
+        <div>
+            <span style="display: block">婧愬簱浣�</span>
+            <input type="text">
+        </div>
+    </div>
+    <div style="float: left;width: 30%;height: 100%;position: relative;">
+        <span style="position:absolute;top: 45%;left: 50%;color: #666;transform: translateX(-50%);;display: block">绉昏浆鑷�</span>
+        <hr style="position: absolute; top: 50%;width: 100%;border: none;height: 1px;background-color: #666">
+
+    </div>
+    <div style="float: right;width: 35%;height: 100%">
+        <div>
+            <span style="display: block">鐩爣搴撲綅</span>
+            <input type="text">
+        </div>
+    </div>
+</div>
+</body>
+</html>
diff --git a/src/main/webapp/views/pakStoreSxk/matQuery.html b/src/main/webapp/views/pakStoreSxk/matQuery.html
new file mode 100644
index 0000000..54c50b4
--- /dev/null
+++ b/src/main/webapp/views/pakStoreSxk/matQuery.html
@@ -0,0 +1,173 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+    <link rel="stylesheet" href="../../static/css/common.css" media="all">
+    <style>
+        body {
+            /*overflow: hidden;*/
+        }
+        .layui-table-box {
+            border-right: 1px solid #9F9F9F;
+            border-left: 1px solid #9F9F9F;
+        }
+    </style>
+</head>
+<body>
+<div style="padding: 25px; line-height: 22px; background-color: #393D49; color: #fff; font-weight: 300;">
+    <span style="font-size: large; font-weight: bold">閫夋嫨鍟嗗搧</span>
+</div>
+<div class="layui-card" style="padding: 0 20px; overflow: scroll;">
+    <fieldset class="layui-elem-field site-demo-button" style="margin: 20px;">
+        <legend>鎼滅储鏍�</legend>
+        <div id="search-box" class="layui-form layui-card-header">
+            <div class="layui-inline">
+                <div class="layui-input-inline">
+                    <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+                </div>
+            </div>
+            <div class="layui-inline">
+                <div class="layui-input-inline">
+                    <input class="layui-input" type="text" name="maktx" placeholder="鍟嗗搧鍚嶇О" autocomplete="off">
+                </div>
+            </div>
+            <!-- 鏃ユ湡鑼冨洿 -->
+            <div class="layui-inline" style="width: 300px">
+                <div class="layui-input-inline">
+                    <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+                </div>
+            </div>
+            <div class="layui-inline">
+                <div class="layui-input-inline">
+                    <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+                </div>
+            </div>
+            <!-- 寰呮坊鍔� -->
+            <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
+                <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
+            </div>
+        </div>
+    </fieldset>
+
+    <div class="layui-form">
+        <table class="layui-hide" id="mat" lay-filter="mat"></table>
+    </div>
+</div>
+
+<script type="text/html" id="toolbar">
+    <div class="layui-btn-container">
+        <button class="layui-btn" id="btn-confirm" lay-event="confirm" style="">鎻愬彇</button>
+    </div>
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
+
+</body>
+<script>
+    function getCol() {
+        let cols = [
+            {type: 'checkbox', fixed: 'left'}
+        ];
+        cols.push.apply(cols, matCols);
+        cols.push(
+            {field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true},
+            {field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+        )
+        return cols;
+    }
+
+    layui.config({
+        base: baseUrl + "/static/layui/lay/modules/"
+    }).use(['table','laydate', 'form', 'admin'], function() {
+        var table = layui.table;
+        var $ = layui.jquery;
+        var layer = layui.layer;
+        var layDate = layui.laydate;
+        var form = layui.form;
+        var admin = layui.admin;
+
+        // 鐗╂枡鏌ヨ鏁版嵁琛�
+        matQueryTable = table.render({
+            elem: '#mat',
+            headers: {token: localStorage.getItem('token')},
+            url: baseUrl + '/mat/list/auth',
+            page: true,
+            limit: 7,
+            limits: [7, 10, 30,50,100],
+            even: true,
+            cellMinWidth: 50,
+            toolbar: '#toolbar',
+            cols: [getCol()],
+            request: {
+                pageName: 'curr',
+                pageSize: 'limit'
+            },
+            parseData: function (res) {
+                return {
+                    'code': res.code,
+                    'msg': res.msg,
+                    'count': res.data.total,
+                    'data': res.data.records
+                }
+            },
+            response: {
+                statusCode: 200
+            },
+            done: function (res, curr, count) {
+                if (res.code === 403) {
+                    top.location.href = baseUrl + "/";
+                }
+            }
+        });
+
+        // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(mat)', function (obj) {
+            let checkStatus = table.checkStatus(obj.config.id);
+            let data = checkStatus.data;
+            switch(obj.event) {
+                case 'confirm':
+                    if (data.length === 0){
+                        layer.msg("璇烽�夋嫨鏁版嵁", {icon: 2});
+                        return;
+                    }
+                    parent.addTableData(data);
+                    break;
+            }
+        });
+
+        // 鎼滅储鏍忔悳绱簨浠�
+        form.on('submit(search)', function (data) {
+            tableReload();
+        });
+
+        layDate.render({
+            elem: '.layui-laydate-range'
+            ,type: 'datetime'
+            ,range: true
+        });
+    })
+
+    function tableReload() {
+        var searchData = {};
+        $.each($('#search-box [name]').serializeArray(), function() {
+            searchData[this.name] = this.value;
+        });
+        matQueryTable.reload({
+            where: searchData
+        });
+    }
+
+</script>
+</html>
+
diff --git a/src/main/webapp/views/pakStoreSxk/pakStore.html b/src/main/webapp/views/pakStoreSxk/pakStore.html
new file mode 100644
index 0000000..e230ba4
--- /dev/null
+++ b/src/main/webapp/views/pakStoreSxk/pakStore.html
@@ -0,0 +1,133 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+    <link rel="stylesheet" href="../../static/css/common.css" media="all">
+    <style>
+        html {
+            height: 100%;
+            padding: 10px;
+            background-color: #f1f1f1;
+            box-sizing: border-box;
+        }
+        body {
+            background-color: #fff;
+            border-radius: 5px;
+            box-shadow: 0 0 3px rgba(0,0,0,.3);
+        }
+
+        .function-area {
+            padding: 20px 50px;
+        }
+        .function-btn {
+            font-size: 16px;
+            padding: 1px 2px;
+            width: 100px;
+            height: 50px;
+            border-color: #2b425b;
+            border-radius: 4px;
+            border-width: 2px;
+            background: none;
+            border-style: solid;
+            transition: 0.4s;
+            cursor: pointer;
+            letter-spacing: 1.5px;
+        }
+        .function-btn:hover {
+            background-color: #2b425b;
+            color: #fff;
+        }
+
+        .layui-layer-page .layui-layer-content {
+            position: relative;
+            overflow: visible !important;
+        }
+
+        #mat-query {
+            display: none;
+        }
+
+        #staNoSpan {
+            text-align: center;
+            display: inline-block;
+            width: 100px;
+            font-size: 13px;
+        }
+        .layui-btn-container .layui-form-select {
+            display: inline-block;
+            width: 150px;
+            height: 30px;
+        }
+        .layui-btn-container .layui-form-select.layui-form-selected {
+            display: inline-block;
+            width: 150px;
+        }
+        .layui-btn-container .layui-select-title input {
+            font-size: 13px;
+        }
+        .layui-btn-container .layui-anim.layui-anim-upbit dd {
+            font-size: 13px;
+        }
+
+        #btn-comb {
+            margin-left: 60px;
+            display: none;
+        }
+    </style>
+</head>
+<body>
+<!-- 鍔熻兘鍖� -->
+<div class="function-area">
+    <button id="mat-query" class="function-btn">鎻愬彇鍟嗗搧</button>
+</div>
+
+<hr>
+
+<!-- 琛ㄦ牸 -->
+<div style="padding-bottom: 5px; margin-bottom: 45px">
+
+    <!-- 澶撮儴 -->
+    <script type="text/html" id="toolbar">
+        <div class="layui-form">
+            <div class="layui-btn-container">
+                <!-- 1.閫夋嫨鍏ュ簱鍙� -->
+                <span id="staNoSpan">鍏ュ簱鍙ｏ細</span>
+                <select id="putSiteSelect" lay-verify="required">
+                    <option value="">璇烽�夋嫨绔欑偣</option>
+                </select>
+                <!-- 2.鍚姩鍏ュ簱 -->
+                <button class="layui-btn layui-btn-normal layui-btn-lg" id="btn-comb" lay-event="comb" style="">鍚姩鍏ュ簱</button>
+            </div>
+        </div>
+    </script>
+
+    <!-- 琛� -->
+    <script type="text/html" id="operate">
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="remove">绉婚櫎</a>
+    </script>
+
+    <table class="layui-table" id="chooseData" lay-filter="chooseData"></table>
+</div>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
+<script type="text/javascript" src="../../static/js/pakStoreSxk/pakStore.js" charset="utf-8"></script>
+
+<script type="text/template" id="putSiteSelectTemplate">
+    {{#each data}}
+        <option value="{{this}}">{{this}}</option>
+    {{/each}}
+</script>
+</body>
+</html>
+
diff --git a/src/main/webapp/views/pakStoreSxk/stockOut.html b/src/main/webapp/views/pakStoreSxk/stockOut.html
new file mode 100644
index 0000000..f82d7f6
--- /dev/null
+++ b/src/main/webapp/views/pakStoreSxk/stockOut.html
@@ -0,0 +1,131 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+    <link rel="stylesheet" href="../../static/css/common.css" media="all">
+    <style>
+        html {
+            height: 100%;
+            padding: 10px;
+            background-color: #f1f1f1;
+            box-sizing: border-box;
+        }
+        body {
+            background-color: #fff;
+            border-radius: 5px;
+            box-shadow: 0 0 3px rgba(0,0,0,.3);
+            padding-bottom: 20px;
+        }
+
+        #staNoSpan {
+            text-align: center;
+            display: inline-block;
+            width: 100px;
+            font-size: 13px;
+        }
+        .layui-btn-container .layui-form-select {
+            display: inline-block;
+            width: 150px;
+            height: 30px;
+        }
+        .layui-btn-container .layui-form-select.layui-form-selected {
+            display: inline-block;
+            width: 150px;
+        }
+        .layui-btn-container .layui-select-title input {
+            font-size: 13px;
+        }
+        .layui-btn-container .layui-anim.layui-anim-upbit dd {
+            font-size: 13px;
+        }
+
+        #btn-outbound {
+            margin-left: 60px;
+            display: none;
+        }
+
+        /*----------------------------------*/
+        .function-area {
+            padding: 20px 50px;
+        }
+        .function-btn {
+            font-size: 16px;
+            padding: 1px 2px;
+            width: 100px;
+            height: 50px;
+            border-color: #2b425b;
+            border-radius: 4px;
+            border-width: 2px;
+            background: none;
+            border-style: solid;
+            transition: 0.4s;
+            cursor: pointer;
+            letter-spacing: 1.5px;
+        }
+        .function-btn:hover {
+            background-color: #2b425b;
+            color: #fff;
+        }
+
+        #mat-query {
+            display: none;
+        }
+    </style>
+</head>
+<body>
+
+<!-- 鍔熻兘鍖� -->
+<div class="function-area">
+    <button id="mat-query" class="function-btn">鎻愬彇搴撳瓨</button>
+</div>
+
+<hr>
+
+<!-- 琛ㄦ牸 -->
+<div style="padding-bottom: 5px; margin-bottom: 45px">
+
+    <!-- 澶撮儴 -->
+    <script type="text/html" id="toolbar">
+        <div class="layui-form">
+            <div class="layui-btn-container">
+                <!-- 1.閫夋嫨鍑哄簱鍙� -->
+                <span id="staNoSpan">鍑哄簱鍙ｏ細</span>
+                <select id="staNoSelect" lay-verify="required">
+                    <option value="">璇烽�夋嫨绔欑偣</option>
+                </select>
+                <!-- 2.鍚姩鍑哄簱 -->
+                <button class="layui-btn layui-btn-lg" id="btn-outbound" lay-event="outbound">鍚姩鍑哄簱</button>
+            </div>
+        </div>
+    </script>
+
+    <!-- 琛� -->
+    <script type="text/html" id="operate">
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="remove">绉婚櫎</a>
+    </script>
+
+    <table class="layui-table" id="chooseData" lay-filter="chooseData"></table>
+</div>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
+<script type="text/javascript" src="../../static/js/pakStoreSxk/stockOut.js" charset="utf-8"></script>
+
+<script type="text/template" id="takeSiteSelectTemplate">
+    {{#each data}}
+    <option value="{{siteId}}">{{desc}}</option>
+    {{/each}}
+</script>
+</body>
+</html>
+

--
Gitblit v1.9.1