From fbdad64fe45fa120beb4332e7a3615856d05ab96 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 06 三月 2025 18:20:05 +0800
Subject: [PATCH] 四期

---
 src/main/java/com/zy/asrs/controller/OrderController.java         |    6 +
 src/main/java/com/zy/asrs/mapper/AgvWrkDetlMapper.java            |   18 ++-
 src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java |   21 +++--
 src/main/webapp/views/agvBasDevp/basDevp_detail.html              |   11 ++
 src/main/java/com/zy/Boot.java                                    |    2 
 src/main/resources/四期sql/devp                                     |   38 ++++++++-
 src/main/java/com/zy/asrs/controller/AgvOpenController.java       |  107 +++++++++++++-------------
 src/main/java/com/zy/asrs/controller/OrderDetlController.java     |   19 +++-
 8 files changed, 141 insertions(+), 81 deletions(-)

diff --git a/src/main/java/com/zy/Boot.java b/src/main/java/com/zy/Boot.java
index 0e46363..8ffcfde 100644
--- a/src/main/java/com/zy/Boot.java
+++ b/src/main/java/com/zy/Boot.java
@@ -22,6 +22,4 @@
         RandomValidateCodeUtil.init();
         return builder.sources(Boot.class);
     }
-
-
 }
diff --git a/src/main/java/com/zy/asrs/controller/AgvOpenController.java b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
index cc5b3b8..158ca08 100644
--- a/src/main/java/com/zy/asrs/controller/AgvOpenController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
@@ -7,7 +7,6 @@
 import com.core.common.Cools;
 import com.core.common.R;
 import com.zy.asrs.entity.AgvBasDevp;
-import com.zy.asrs.entity.AgvLocMast;
 import com.zy.asrs.entity.AgvWrkMast;
 import com.zy.asrs.entity.WrkMastExecute;
 import com.zy.asrs.entity.param.AgvTaskCallBackParam;
@@ -64,56 +63,54 @@
 
     @PostMapping("/task/event/status")
     @AppAuth(memo = "ESS浠诲姟鍥炶皟")
-    public R taskEventStaus(@RequestBody AgvTaskCallBackParam param, HttpServletRequest request){
-
-
+    public R taskEventStaus(@RequestBody AgvTaskCallBackParam param, HttpServletRequest request) {
 
 
         //save api log (appkey 鍚庣画娣诲姞)
 
         R r = new R(0, "鎴愬姛");
 
-        AppAuthUtil.auth("",param, request);
+        AppAuthUtil.auth("", param, request);
         int wrkNo = Integer.parseInt(param.getTaskCode());
-        if(wrkNo < 0){
+        if (wrkNo < 0) {
             wrkNo = -wrkNo;
         }
         AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("wrk_no", wrkNo));
-        if(Cools.isEmpty(agvWrkMast)){
-            agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode",param.getPodCode()));
-            if (Cools.isEmpty(agvWrkMast)){
+        if (Cools.isEmpty(agvWrkMast)) {
+            agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", param.getPodCode()));
+            if (Cools.isEmpty(agvWrkMast)) {
                 r = R.error("浠诲姟缂栧彿閿欒");
-                logPost(param,JSONObject.toJSONString(r),false);
+                logPost(param, JSONObject.toJSONString(r), false);
                 return r;
             }
         }
-        if (agvWrkMast.getIoType().equals(121)){
-            try{
-                if (agvWrkMast.getWrkSts().equals(12L)){
+        if (agvWrkMast.getIoType().equals(121)) {
+            try {
+                if (agvWrkMast.getWrkSts().equals(12L)) {
                     WrkMastExecute wrkMastExecute = wrkMastExecuteService.selectOne(new EntityWrapper<WrkMastExecute>().eq("wrk_no", wrkNo));
-                    if (Cools.isEmpty(wrkMastExecute) || wrkMastExecute.getWrkSts()!=1){
-                        r = R.error("浠诲姟鐘舵�乄rkSts鍙傛暟鏈夎,WrkSts:"+wrkMastExecute.getWrkSts$());
-                        logPost(param,"浠诲姟鐘舵�乄rkSts鍙傛暟鏈夎,WrkSts:"+wrkMastExecute.getWrkSts$()+JSONObject.toJSONString(r),false);
+                    if (Cools.isEmpty(wrkMastExecute) || wrkMastExecute.getWrkSts() != 1) {
+                        r = R.error("浠诲姟鐘舵�乄rkSts鍙傛暟鏈夎,WrkSts:" + wrkMastExecute.getWrkSts$());
+                        logPost(param, "浠诲姟鐘舵�乄rkSts鍙傛暟鏈夎,WrkSts:" + wrkMastExecute.getWrkSts$() + JSONObject.toJSONString(r), false);
                         return r;
                     } else {
                         wrkMastExecute.setWrkSts(wrkMastExecute.getWrkStsCode());
                         wrkMastExecuteService.updateById(wrkMastExecute);
                     }
-                }else {
+                } else {
                     r = R.error("浠诲姟寮傚父");
-                    logPost(param,JSONObject.toJSONString(r),false);
+                    logPost(param, JSONObject.toJSONString(r), false);
 
                     return r;
                 }
-            }catch (Exception e){
-                r = R.error(""+e.getMessage());
-                logPost(param,JSONObject.toJSONString(r),false);
+            } catch (Exception e) {
+                r = R.error("" + e.getMessage());
+                logPost(param, JSONObject.toJSONString(r), false);
                 return r;
             }
-        }else {
-            if(agvWrkMast.getWrkSts() >= 205){
+        } else {
+            if (agvWrkMast.getWrkSts() >= 205) {
                 r = R.error("褰撳墠浠诲姟宸插畬鎴�");
-                logPost(param,JSONObject.toJSONString(r),false);
+                logPost(param, JSONObject.toJSONString(r), false);
                 return r;
             }
 
@@ -121,35 +118,35 @@
             Class<AgvTask> clz = AgvTask.class;
             try {
                 Method method = clz.getDeclaredMethod("success", AgvWrkMast.class, AgvTaskCallBackParam.class);
-                method.invoke(agvTask,agvWrkMast,param);
+                method.invoke(agvTask, agvWrkMast, param);
             } catch (NoSuchMethodException e) {
                 r = R.error("浠诲姟鐘舵�乻tatus鍙傛暟鏈夎");
-                logPost(param,JSONObject.toJSONString(r),false);
+                logPost(param, JSONObject.toJSONString(r), false);
                 return r;
             } catch (InvocationTargetException e) {
                 log.error(e.getMessage());
-                r = R.error(""+e.getMessage());
-                logPost(param,JSONObject.toJSONString(r),false);
+                r = R.error("" + e.getMessage());
+                logPost(param, JSONObject.toJSONString(r), false);
                 return r;
             } catch (IllegalAccessException e) {
                 log.error(e.getMessage());
-                r = R.error(""+e.getMessage());
-                logPost(param,JSONObject.toJSONString(r),false);
+                r = R.error("" + e.getMessage());
+                logPost(param, JSONObject.toJSONString(r), false);
                 return r;
             }
         }
-        logPost(param,JSONObject.toJSONString(r),true);
+        logPost(param, JSONObject.toJSONString(r), true);
         return r;
     }
 
     @PostMapping("/conveyor/loadContainerFinish ")
     @AppAuth(memo = "鍙栬揣鏋跺畬鎴愰�氱煡")
-    public R loadContainerFinish(@RequestBody Map<String,Object> params){
+    public R loadContainerFinish(@RequestBody Map<String, Object> params) {
 
         return R.ok();
     }
 
-    private void logPost( AgvTaskCallBackParam param,String response,boolean success){
+    private void logPost(AgvTaskCallBackParam param, String response, boolean success) {
         apiLogService.save(
                 "ESS浠诲姟鍥炶皟",
                 "/phyzwms/agv/task/event/status",
@@ -162,28 +159,27 @@
     }
 }
 
-enum AgvTask{
+enum AgvTask {
 
     /**
      * 涓婃姤浠诲姟瀹屾垚
      */
-    end{
+    end {
         @Transactional
         public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
-
 
 
             //淇敼AGV宸ヤ綔妗g殑宸ヤ綔鐘舵�佷负205.宸ヤ綔瀹屾垚
             agvWrkMast.setWrkSts(205L);
 
             //鍑哄簱浠诲姟 101.鍑哄簱 || 103.鎷f枡鍑哄簱 || 107.鐩樼偣鍑哄簱
-            if(agvWrkMast.getIoType() == 101 || agvWrkMast.getIoType() == 103 || agvWrkMast.getIoType() == 107){
+            if (agvWrkMast.getIoType() == 101 || agvWrkMast.getIoType() == 103 || agvWrkMast.getIoType() == 107) {
                 //淇敼鍑哄簱绔欑偣鐘舵��
-                agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
+                agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
             }
             //鍑哄簱浠诲姟 110.绌烘澘鍑哄簱
-            if(agvWrkMast.getIoType() == 110){
-                agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
+            if (agvWrkMast.getIoType() == 110) {
+                agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                 agvWrkMast.setWrkSts(206L);
             }
             agvWrkMast.setModiTime(new Date());
@@ -193,7 +189,7 @@
     /**
      * 浠诲姟寮�濮�
      */
-    start{
+    start {
         @Transactional
         public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
             //淇敼AGV宸ヤ綔妗g殑宸ヤ綔鐘舵�佷负203.浠诲姟寮�濮�
@@ -206,20 +202,27 @@
     /**
      * 璧板嚭鍌ㄤ綅鐘舵��
      */
-    outbin{
+    outbin {
         @Transactional
         public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
 
-            switch(agvWrkMast.getIoType()) {
+            switch (agvWrkMast.getIoType()) {
                 //鍏ュ簱浠诲姟
                 case 1:
-                // 绌烘澘鍏ュ簱
+                    // 绌烘澘鍏ュ簱
                 case 10:
-                // 鎷f枡鍏ュ簱浠诲姟
+                    // 鎷f枡鍏ュ簱浠诲姟
                 case 53:
-                // 鐩樼偣鍐嶅叆搴�
+                    // 鐩樼偣鍐嶅叆搴�
                 case 57:
-                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",null);
+                    AgvBasDevp byDevNo = agvBasDevpService.getByDevNo(agvWrkMast.getSourceLocNo());
+                    String locSts = "O";
+                    if (byDevNo != null && byDevNo.getLocSts() == "R") {
+                        locSts = "O";
+                    } else {
+                        locSts = byDevNo.getLocSts();
+                    }
+                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), locSts, "", null);
                     break;
             }
             //if(agvWrkMast.getIoType() == 1 || agvWrkMast.getIoType() == 53 || agvWrkMast.getIoType() == 57 || agvWrkMast.getIoType() == 10){
@@ -228,7 +231,7 @@
             //}
 
             //淇敼AGV宸ヤ綔妗g殑宸ヤ綔鐘舵�佷负203.RCS鏀捐揣涓�
-            agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),204);
+            agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(), 204);
 
         }
 
@@ -236,7 +239,7 @@
     /**
      * 涓婃姤鏀剧鐘舵��
      */
-    cancel{
+    cancel {
         @Transactional
         public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
 
@@ -244,7 +247,7 @@
         }
 
     },
-    apply{
+    apply {
         @Transactional
         public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
 
@@ -301,8 +304,8 @@
         AgvWrkDetlLogService agvWrkDetlLogService;
 
         @PostConstruct
-        public void postConstruct(){
-            for(AgvTask task : EnumSet.allOf(AgvTask.class)){
+        public void postConstruct() {
+            for (AgvTask task : EnumSet.allOf(AgvTask.class)) {
                 task.setAgvBasDevpService(agvBasDevpService);
                 task.setAgvLocDetlService(agvLocDetlService);
                 task.setAgvLocMastService(agvLocMastService);
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 31bae3d..a0b3139 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -948,13 +948,17 @@
     }
 
     @RequestMapping(value = "/order/update/auth")
-    @ManagerAuth
+    @ManagerAuth(memo = "淇敼璁㈠崟鐘舵��")
     public R update(Order order) {
         if (Cools.isEmpty(order) || null == order.getId()) {
             return R.error("鍙傛暟缂哄け");
         }
         order.setUpdateBy(getUserId());
         order.setUpdateTime(new Date());
+        Long settle = order.getSettle();
+        if (settle != null && settle == 6) {
+            order.setMemo(Cools.isEmpty(order.getMemo()) ? "鎵嬪姩瀹岀粨" : order.getMemo() + "鎵嬪姩瀹岀粨");
+        }
         if (!orderService.updateById(order)) {
             throw new CoolException("淇敼璁㈠崟澶辫触");
         }
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index 718f555..be477d4 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -13,6 +13,7 @@
 import com.zy.asrs.entity.DocType;
 import com.zy.asrs.entity.Order;
 import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.mapper.AgvWrkDetlMapper;
 import com.zy.asrs.service.*;
 import com.zy.common.web.BaseController;
 import lombok.Synchronized;
@@ -39,6 +40,9 @@
     private LocDetlService locDetlService;
     @Autowired
     private AgvLocDetlService agvLocDetlService;
+
+    @Autowired
+    private AgvWrkDetlMapper agvWrkDetlMapper;
 
     @RequestMapping(value = "/orderDetl/{id}/auth")
     @ManagerAuth
@@ -183,7 +187,8 @@
         for (OrderDetl record : page.getRecords()) {
             Double sumAnfme = agvLocDetlService.getSumAnfme(record.getMatnr(), record.getThreeCode());
             record.setStock(sumAnfme == null ? 0 : sumAnfme);
-            record.setWorkNum(0D);
+            //Double workNum = agvWrkDetlMapper.sumAnfmeByMatnr(record.getMatnr(), record.getThreeCode(), record.getOrderNo());
+            //record.setWorkNum(workNum == null ? 0 : workNum);
         }
         return R.ok(page);
     }
@@ -240,7 +245,8 @@
                 sumAnfme = agvLocDetlService.getSumAnfme(record.getMatnr(), record.getThreeCode());
             }
             record.setStock(sumAnfme == null ? 0 : sumAnfme);
-            record.setWorkNum(0D);
+            //Double workNum = agvWrkDetlMapper.sumAnfmeByMatnr(record.getMatnr(), record.getThreeCode(), record.getOrderNo());
+            //record.setWorkNum(workNum == null ? 0 : workNum);
         }
         return R.ok(page);
     }
@@ -309,7 +315,8 @@
         for (OrderDetl record : page.getRecords()) {
             Double sumAnfme = agvLocDetlService.getSumAnfmeProcessed(record.getMatnr(), record.getThreeCode());
             record.setStock(sumAnfme == null ? 0 : sumAnfme);
-            record.setWorkNum(0D);
+            //Double workNum = agvWrkDetlMapper.sumAnfmeByMatnr(record.getMatnr(), record.getThreeCode(), record.getOrderNo());
+            //record.setWorkNum(workNum == null ? 0 : workNum);
         }
 
         return R.ok(page);
@@ -344,7 +351,8 @@
         for (OrderDetl record : page.getRecords()) {
             Double sumAnfme = agvLocDetlService.getSumAnfmeProcessed2(record.getMatnr(), record.getThreeCode());
             record.setStock(sumAnfme == null ? 0 : sumAnfme);
-            record.setWorkNum(0D);
+            //Double workNum = agvWrkDetlMapper.sumAnfmeByMatnr(record.getMatnr(), record.getThreeCode(), record.getOrderNo());
+            //record.setWorkNum(workNum == null ? 0 : workNum);
         }
 
         return R.ok(page);
@@ -378,7 +386,8 @@
         for (OrderDetl record : page.getRecords()) {
             Double sumAnfme = agvLocDetlService.getSumAnfme(record.getMatnr(), record.getThreeCode());
             record.setStock(sumAnfme == null ? 0 : sumAnfme);
-            record.setWorkNum(0D);
+            //Double workNum = agvWrkDetlMapper.sumAnfmeByMatnr(record.getMatnr(), record.getThreeCode(), record.getOrderNo());
+            //record.setWorkNum(workNum == null ? 0 : workNum);
         }
 
         return R.ok(page);
diff --git a/src/main/java/com/zy/asrs/mapper/AgvWrkDetlMapper.java b/src/main/java/com/zy/asrs/mapper/AgvWrkDetlMapper.java
index be4a05b..0c4c476 100644
--- a/src/main/java/com/zy/asrs/mapper/AgvWrkDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AgvWrkDetlMapper.java
@@ -15,22 +15,26 @@
 public interface AgvWrkDetlMapper extends BaseMapper<AgvWrkDetl> {
 
     @Select("SELECT * FROM agv_wrk_detl WHERE wrk_no = #{wrkNo}")
-    List<AgvWrkDetl> selectByWrkNo(@Param("wrkNo")Integer wrkNo);
+    List<AgvWrkDetl> selectByWrkNo(@Param("wrkNo") Integer wrkNo);
 
-    int deleteItem(@Param("wrkNo")Integer wrkNo, @Param("matnr")String matnr, @Param("batch")String batch);
+    int deleteItem(@Param("wrkNo") Integer wrkNo, @Param("matnr") String matnr, @Param("batch") String batch);
 
-    int updateAnfme(@Param("anfme")Double anfme, @Param("wrkNo")Integer wrkNo, @Param("matnr")String matnr, @Param("batch")String batch);
+    int updateAnfme(@Param("anfme") Double anfme, @Param("wrkNo") Integer wrkNo, @Param("matnr") String matnr, @Param("batch") String batch);
 
     List<WrkDetl> selectAndLogByOrderNo(String orderNo);
 
     List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo);
 
-    int updateInspect( @Param("wrkNo")Integer wrkNo, @Param("matnr")String matnr, @Param("batch")String batch);
+    int updateInspect(@Param("wrkNo") Integer wrkNo, @Param("matnr") String matnr, @Param("batch") String batch);
 
-    List<WrkDetl> selectPakoutQuery(@Param("staNo")Integer staNo, @Param("matnr")String matnr);
+    List<WrkDetl> selectPakoutQuery(@Param("staNo") Integer staNo, @Param("matnr") String matnr);
 
-    int updateOrderNo(@Param("orderNo")String orderNo, @Param("wrkNo")Integer wrkNo, @Param("matnr")String matnr, @Param("batch")String batch);
+    int updateOrderNo(@Param("orderNo") String orderNo, @Param("wrkNo") Integer wrkNo, @Param("matnr") String matnr, @Param("batch") String batch);
 
-    int updateWrkNo1(@Param("wrk_no")Integer wrkNo, @Param("supp_code")String barcode, @Param("matnr")String matnr, @Param("three_code")String threeCode);
+    int updateWrkNo1(@Param("wrk_no") Integer wrkNo, @Param("supp_code") String barcode, @Param("matnr") String matnr, @Param("three_code") String threeCode);
+
+
+    @Select("SELECT sum(d.anfme) from agv_wrk_detl d ,agv_wrk_mast m where d.wrk_no=m.wrk_no and m.io_type in (101,103,53) and d.matnr = #{matnr}   AND d.three_code = #{threeCode}  AND d.order_no = #{orderNo} AND d.process_sts != 1")
+    Double sumAnfmeByMatnr(@Param("matnr") String matnr, @Param("threeCode") String threeCode, @Param("orderNo") String orderNo);
 
 }
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
index 165605d..57823ab 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -58,14 +58,18 @@
         List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", taskCode));
         long flowId = snowflakeIdWorker.nextId();
         agvWrkDetls.stream().map(agvWrkDetl -> {
-            AgvLocDetl agvLocDetl = new AgvLocDetl();
-            //log.info("agvWrkDetl: " + agvLocDetl.getBarcode());
-            BeanUtils.copyProperties(agvWrkDetl, agvLocDetl);
-            agvLocDetl.setLocNo(locNo);
-            //log.info("zc娣诲姞搴撳瓨鏃ュ織:{}", JSON.toJSON(agvLocDetl));
-            this.insert(agvLocDetl);
-            // 娴佹按 -- 鏂板璁㈠崟鏄庣粏
-            OrderDetl orderDetl = orderDetlService.selectItem(agvWrkDetl.getOrderNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode());
+            AgvLocDetl agvLocDetl = this.selectOne(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo).eq("matnr", agvWrkDetl.getMatnr()).eq("three_code", agvWrkDetl.getThreeCode()));
+            if (agvLocDetl != null) {
+                this.updateAnfme(agvLocDetl.getAnfme() + agvWrkDetl.getAnfme(), agvLocDetl.getLocNo(), agvLocDetl.getMatnr(), agvLocDetl.getBatch(), agvLocDetl.getThreeCode(), agvLocDetl.getDeadTime());
+            } else {
+                agvLocDetl = new AgvLocDetl();
+                //log.info("agvWrkDetl: " + agvLocDetl.getBarcode());
+                BeanUtils.copyProperties(agvWrkDetl, agvLocDetl);
+                agvLocDetl.setLocNo(locNo);
+                //log.info("zc娣诲姞搴撳瓨鏃ュ織:{}", JSON.toJSON(agvLocDetl));
+                this.insert(agvLocDetl);
+                // 娴佹按 -- 鏂板璁㈠崟鏄庣粏
+                OrderDetl orderDetl = orderDetlService.selectItem(agvWrkDetl.getOrderNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode());
 //            FlowLog flowLog = new FlowLog();
 //            flowLog.setFid(String.valueOf(flowId));
 //            flowLog.setSpare2(String.valueOf(taskCode));
@@ -91,6 +95,7 @@
 //            if (!flowLogService.insert(flowLog)) {
 //                throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
 //            }
+            }
             return agvLocDetl;
         }).collect(Collectors.toList());
 
diff --git "a/src/main/resources/\345\233\233\346\234\237sql/devp" "b/src/main/resources/\345\233\233\346\234\237sql/devp"
index 67e63b1..3310bb3 100644
--- "a/src/main/resources/\345\233\233\346\234\237sql/devp"
+++ "b/src/main/resources/\345\233\233\346\234\237sql/devp"
@@ -105,12 +105,38 @@
 
 
 
-INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_80F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, 133, '2024-07-04 16:24:38.550', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
-INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_81F4', NULL, NULL, 'N', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, NULL, '2024-04-02 09:25:50.747', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
-INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_82F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, 133, '2024-07-04 16:24:44.310', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
-INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_83F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, 133, '2024-07-04 16:25:01.967', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
-INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_84F4', NULL, NULL, 'N', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, NULL, '2024-04-02 09:25:50.747', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
-INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_85F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, 133, '2024-07-04 16:24:44.310', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
+INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_11F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, 133, '2024-07-04 16:24:38.550', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
+INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_12F4', NULL, NULL, 'N', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, NULL, '2024-04-02 09:25:50.747', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
+INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_13F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, 133, '2024-07-04 16:24:44.310', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
+INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_14F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, 133, '2024-07-04 16:25:01.967', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
+INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_15F4', NULL, NULL, 'N', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, NULL, '2024-04-02 09:25:50.747', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
+INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_16F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, 133, '2024-07-04 16:24:44.310', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
+INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_17F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, 133, '2024-07-04 16:24:44.310', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
+INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_18F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, 133, '2024-07-04 16:24:44.310', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
+
+INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_31F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, 133, '2024-07-04 16:24:38.550', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
+INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_32F4', NULL, NULL, 'N', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, NULL, '2024-04-02 09:25:50.747', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
+INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_33F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, 133, '2024-07-04 16:24:44.310', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
+INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_34F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, 133, '2024-07-04 16:25:01.967', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
+INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_35F4', NULL, NULL, 'N', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, NULL, '2024-04-02 09:25:50.747', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
+INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_36F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, 133, '2024-07-04 16:24:44.310', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
+INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_37F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, 133, '2024-07-04 16:24:44.310', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
+INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_38F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, 133, '2024-07-04 16:24:44.310', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
+
+INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_51F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, 133, '2024-07-04 16:24:38.550', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
+INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_52F4', NULL, NULL, 'N', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, NULL, '2024-04-02 09:25:50.747', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
+INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_53F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, 133, '2024-07-04 16:24:44.310', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
+INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_54F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, 133, '2024-07-04 16:25:01.967', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
+INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_55F4', NULL, NULL, 'N', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, NULL, '2024-04-02 09:25:50.747', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
+INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_56F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, 133, '2024-07-04 16:24:44.310', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
+INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_57F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, 133, '2024-07-04 16:24:44.310', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
+INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('YO_58F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 2, 20, NULL, 133, '2024-07-04 16:24:44.310', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
+
+
+
+
+
+
 
 INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('QO_51F4', NULL, NULL, 'N', 'Y', 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 6, 31, NULL, 133, '2024-07-04 16:24:38.550', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
 INSERT INTO [dbo].[agv_bas_devp]([dev_no], [dec_desc], [dev_mk], [in_enable], [out_enable], [autoing], [loading], [canining], [canouting], [fronting], [rearing], [uping], [downing], [loc_sts], [cache_shelves], [wrk_no], [floor], [ctn_type], [barcode], [in_qty], [row1], [io_time], [area], [in_ok], [out_ok], [loc_type1], [loc_type2], [loc_type3], [modi_user], [modi_time], [appe_user], [appe_time], [std_qty], [min_wt], [max_wt], [gross_wt], [cart_pos], [qr_code_value], [loc_no], [station_code]) VALUES ('QO_52F4', NULL, NULL, 'N', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'O', NULL, 0, 4, 0, '', 0, NULL, NULL, NULL, NULL, NULL, 6, 31, NULL, NULL, '2024-04-02 09:25:50.747', NULL, '2024-04-02 09:25:50.747', .000, .000, .000, .000, 0, NULL, NULL, NULL);
diff --git a/src/main/webapp/views/agvBasDevp/basDevp_detail.html b/src/main/webapp/views/agvBasDevp/basDevp_detail.html
index ce5e6a3..870bab2 100644
--- a/src/main/webapp/views/agvBasDevp/basDevp_detail.html
+++ b/src/main/webapp/views/agvBasDevp/basDevp_detail.html
@@ -75,6 +75,17 @@
                 <input id="barcode" class="layui-input" type="text">
             </div>
         </div>
+<!--        <div class="layui-inline">-->
+<!--            <div class="layui-input-inline cool-auto-complete">-->
+<!--                <input id="locSts" class="layui-input" type="text" style="display: none" name="loc_sts">-->
+<!--                <input id="locSts$" placeholder="鎺ラ┏绔欑偣鐘舵��" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" onfocus=this.blur()>-->
+<!--                <div class="cool-auto-complete-window">-->
+<!--                    <input class="cool-auto-complete-window-input" data-key="basLocStsQueryBylocSts" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!--                    <select class="cool-auto-complete-window-select" data-key="basLocStsQueryBylocStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!--                    </select>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
         <hr class="layui-bg-gray">
 
         <div id="data-detail-btn" class="layui-btn-container layui-form-item">

--
Gitblit v1.9.1