From 78dde5ad6acc2a49fd08472afb61a1504ea791d9 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 22 八月 2025 13:38:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs

---
 src/main/java/com/zy/asrs/service/AgvSiteService.java          |    8 
 src/main/java/com/zy/asrs/entity/vo/AgvSiteListVo.java         |   15 +
 src/main/java/com/zy/asrs/service/impl/AgvSiteServiceImpl.java |   12 
 src/main/java/com/zy/asrs/mapper/AgvSiteMapper.java            |   12 
 src/main/java/com/zy/asrs/controller/MobileController.java     |   11 
 src/main/resources/mapper/AgvSiteMapper.xml                    |   16 +
 src/main/java/com/zy/asrs/controller/AgvSiteController.java    |  131 +++++++++
 src/main/java/com/zy/common/CodeBuilder.java                   |    2 
 src/main/java/agvSite.sql                                      |   18 +
 src/main/webapp/views/agvSite/agvSite.html                     |  121 ++++++++
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java    |    9 
 src/main/java/com/zy/asrs/entity/AgvSite.java                  |   70 +++++
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java  |  112 ++++++++
 src/main/webapp/static/js/agvSite/agvSite.js                   |  250 +++++++++++++++++
 src/main/java/com/zy/common/service/CommonService.java         |    8 
 src/main/java/com/zy/asrs/service/MobileService.java           |    4 
 16 files changed, 795 insertions(+), 4 deletions(-)

diff --git a/src/main/java/agvSite.sql b/src/main/java/agvSite.sql
new file mode 100644
index 0000000..851f745
--- /dev/null
+++ b/src/main/java/agvSite.sql
@@ -0,0 +1,18 @@
+-- save agvSite record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'agvSite/agvSite.html', 'agvSite绠$悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'agvSite#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'agvSite#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'agvSite#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'agvSite#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'agvSite#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'agvSite/agvSite.html', N'agvSite绠$悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'agvSite#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'agvSite#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'agvSite#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'agvSite#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'agvSite#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/java/com/zy/asrs/controller/AgvSiteController.java b/src/main/java/com/zy/asrs/controller/AgvSiteController.java
new file mode 100644
index 0000000..0540b3e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/AgvSiteController.java
@@ -0,0 +1,131 @@
+package com.zy.asrs.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.DateUtils;
+import com.zy.asrs.entity.AgvSite;
+import com.zy.asrs.service.AgvSiteService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class AgvSiteController extends BaseController {
+
+    @Autowired
+    private AgvSiteService agvSiteService;
+
+
+
+    @RequestMapping(value = "/agvSite/{id}/auth")
+    @ManagerAuth
+    public R get(@PathVariable("id") String id) {
+        return R.ok(agvSiteService.selectById(String.valueOf(id)));
+    }
+
+    @RequestMapping(value = "/agvSite/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){
+        EntityWrapper<AgvSite> wrapper = new EntityWrapper<>();
+        excludeTrash(param);
+        convert(param, wrapper);
+        allLike(AgvSite.class, param.keySet(), wrapper, condition);
+        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+        return R.ok(agvSiteService.selectPage(new Page<>(curr, limit), wrapper));
+    }
+
+    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)){
+                String[] dates = val.split(RANGE_TIME_LINK);
+                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+            } else {
+                wrapper.like(entry.getKey(), val);
+            }
+        }
+    }
+
+    @RequestMapping(value = "/agvSite/add/auth")
+    @ManagerAuth
+    public R add(AgvSite agvSite) {
+        AgvSite agvSite1 = agvSiteService.selectOne(new EntityWrapper<AgvSite>().eq("name", agvSite.getName()));
+        if (null != agvSite1){
+            return R.error("绔欑偣宸茶鍒濆鍖�");
+        }
+        agvSiteService.insert(agvSite);
+        return R.ok();
+    }
+
+	@RequestMapping(value = "/agvSite/update/auth")
+	@ManagerAuth
+    public R update(AgvSite agvSite){
+        if (Cools.isEmpty(agvSite) || null==agvSite.getId()){
+            return R.error();
+        }
+        agvSiteService.updateById(agvSite);
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/agvSite/delete/auth")
+    @ManagerAuth
+    public R delete(@RequestParam(value="ids[]") Long[] ids){
+         for (Long id : ids){
+            agvSiteService.deleteById(id);
+        }
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/agvSite/export/auth")
+    @ManagerAuth
+    public R export(@RequestBody JSONObject param){
+        EntityWrapper<AgvSite> wrapper = new EntityWrapper<>();
+        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+        Map<String, Object> map = excludeTrash(param.getJSONObject("agvSite"));
+        convert(map, wrapper);
+        List<AgvSite> list = agvSiteService.selectList(wrapper);
+        return R.ok(exportSupport(list, fields));
+    }
+
+    @RequestMapping(value = "/agvSiteQuery/auth")
+    @ManagerAuth
+    public R query(String condition) {
+        EntityWrapper<AgvSite> wrapper = new EntityWrapper<>();
+        wrapper.like("id", condition);
+        Page<AgvSite> page = agvSiteService.selectPage(new Page<>(0, 10), wrapper);
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (AgvSite agvSite : page.getRecords()){
+            Map<String, Object> map = new HashMap<>();
+            map.put("id", agvSite.getId());
+            map.put("value", agvSite.getId());
+            result.add(map);
+        }
+        return R.ok(result);
+    }
+
+    @RequestMapping(value = "/agvSite/check/column/auth")
+    @ManagerAuth
+    public R query(@RequestBody JSONObject param) {
+        Wrapper<AgvSite> wrapper = new EntityWrapper<AgvSite>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+        if (null != agvSiteService.selectOne(wrapper)){
+            return R.parse(BaseRes.REPEAT).add(getComment(AgvSite.class, String.valueOf(param.get("key"))));
+        }
+        return R.ok();
+    }
+
+}
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 37835f9..40a5eaa 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -70,6 +70,17 @@
 //
 //
 //    }
+    @PostMapping("/agv/lineCall")
+    @ManagerAuth
+    public R pdaAgvLineCall(@RequestBody Map<String,Object> map){
+        return mobileService.lineCall(map);
+    }
+
+    @GetMapping("/agv/site/list")
+    @ManagerAuth
+    public R pdaAgvSiteList(){
+        return mobileService.siteList();
+    }
 
 
     @PostMapping("/agv/start")
diff --git a/src/main/java/com/zy/asrs/entity/AgvSite.java b/src/main/java/com/zy/asrs/entity/AgvSite.java
new file mode 100644
index 0000000..70291a1
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/AgvSite.java
@@ -0,0 +1,70 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableField;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("man_agv_site")
+public class AgvSite implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value= "")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value= "")
+    private String name;
+
+    @ApiModelProperty(value= "")
+    private String code;
+
+    @ApiModelProperty(value= "")
+    private String area;
+
+    @ApiModelProperty(value= "")
+    @TableField("work_no")
+    private Integer workNo;
+
+    @ApiModelProperty(value= "")
+    private Integer status;
+
+    public AgvSite() {}
+
+    public AgvSite(String name,String code,String area,Integer workNo,Integer status) {
+        this.name = name;
+        this.code = code;
+        this.area = area;
+        this.workNo = workNo;
+        this.status = status;
+    }
+
+//    AgvSite agvSite = new AgvSite(
+//            null,    // 
+//            null,    // 
+//            null,    // 
+//            null,    // 
+//            null    // 
+//    );
+
+    public String getStatus$(){
+        if (null == this.status){ return null; }
+        switch (this.status){
+            case 0:
+                return "绌洪棽";
+            case 1:
+                return "鍗犵敤";
+            case 2:
+                return "棰勭害";
+            default:
+                return String.valueOf(this.status);
+        }
+    }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/vo/AgvSiteListVo.java b/src/main/java/com/zy/asrs/entity/vo/AgvSiteListVo.java
new file mode 100644
index 0000000..161367c
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/vo/AgvSiteListVo.java
@@ -0,0 +1,15 @@
+package com.zy.asrs.entity.vo;
+
+import com.zy.asrs.entity.AgvSite;
+import com.zy.asrs.entity.WrkDetl;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AgvSiteListVo {
+
+    private AgvSite agvSite;
+
+    private List<WrkDetl> wrkDetls;
+}
diff --git a/src/main/java/com/zy/asrs/mapper/AgvSiteMapper.java b/src/main/java/com/zy/asrs/mapper/AgvSiteMapper.java
new file mode 100644
index 0000000..b406b79
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/AgvSiteMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.AgvSite;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface AgvSiteMapper extends BaseMapper<AgvSite> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/AgvSiteService.java b/src/main/java/com/zy/asrs/service/AgvSiteService.java
new file mode 100644
index 0000000..f4c4a40
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/AgvSiteService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.AgvSite;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface AgvSiteService extends IService<AgvSite> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index 4b14a68..db9f27c 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -62,4 +62,8 @@
     void pingKuShelves(CombParam combParam, Long userId);
 
     void pingKuUnShelves(CombParam combParam, Long userId);
+
+    R siteList();
+
+    R lineCall(Map<String, Object> map);
 }
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvSiteServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvSiteServiceImpl.java
new file mode 100644
index 0000000..d368648
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/AgvSiteServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.AgvSiteMapper;
+import com.zy.asrs.entity.AgvSite;
+import com.zy.asrs.service.AgvSiteService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("agvSiteService")
+public class AgvSiteServiceImpl extends ServiceImpl<AgvSiteMapper, AgvSite> implements AgvSiteService {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index f81a2ea..caac500 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -8,6 +8,7 @@
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.*;
 import com.zy.asrs.entity.param.*;
+import com.zy.asrs.entity.vo.AgvSiteListVo;
 import com.zy.asrs.mapper.BasDevpMapper;
 import com.zy.asrs.mapper.ManLocDetlMapper;
 import com.zy.asrs.service.*;
@@ -83,6 +84,8 @@
 
     @Resource
     private BasDevpMapper basDevpMapper;
+    @Autowired
+    private AgvSiteService agvSiteService;
 
     @Override
     public R inLocCallAgv(String sta, String inSta) {
@@ -222,6 +225,58 @@
             }
         }
         return success ? R.ok("瑙g粦鎴愬姛") : R.parse(message);
+    }
+
+    public boolean sendAgvTask(String org,String tar){
+
+        ForwardAGVTaskParam forwardAGVTaskParam = new ForwardAGVTaskParam();
+        forwardAGVTaskParam.setReqCode(UUID.randomUUID().toString().replace("-", ""));
+        forwardAGVTaskParam.setClientCode("IWMS");
+        forwardAGVTaskParam.setTaskTyp("GT3");
+        forwardAGVTaskParam.setCtnrTyp("2");
+        forwardAGVTaskParam.setPriority("1");
+        List<ForwardAGVTaskParam.PositionCodePaths> positionCodePathsList = new ArrayList<>();
+        positionCodePathsList.add(new ForwardAGVTaskParam.PositionCodePaths(org, "05"));
+        positionCodePathsList.add(new ForwardAGVTaskParam.PositionCodePaths(tar, "05"));
+        forwardAGVTaskParam.setPositionCodePath(positionCodePathsList);
+
+        String body = JSON.toJSONString(forwardAGVTaskParam);
+        String response = "";
+        String message = "";
+        boolean success = false;
+        try {
+            response = new HttpHandler.Builder()
+                    .setUri(ApiInterfaceConstant.AGV_IP)
+                    .setPath(ApiInterfaceConstant.AGV_CALL_IN_PATH)
+                    .setJson(body)
+                    .build()
+                    .doPost();
+            JSONObject jsonObject = JSON.parseObject(response);
+            if (jsonObject.getInteger("code").equals(0)) {
+                success = true;
+            } else {
+
+                log.error("鍛煎彨agv澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_CALL_IN_PATH, body, response);
+            }
+        } catch (Exception e) {
+            log.error("鍏ュ簱鍛煎彨agv寮傚父", e);
+        } finally {
+            try {
+                // 淇濆瓨鎺ュ彛鏃ュ織
+                apiLogService.save(
+                        "鍏ュ簱鍛煎彨agv",
+                        ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_CALL_IN_PATH,
+                        null,
+                        "127.0.0.1",
+                        body,
+                        response,
+                        success
+                );
+            } catch (Exception e) {
+                log.error("", e);
+            }
+        }
+        return success;
     }
 
     private boolean bindPodAndBerth(String sta) {
@@ -1223,6 +1278,63 @@
 
     }
 
+    @Override
+    public R siteList() {
+        List<AgvSite> agvSites = agvSiteService.selectList(new EntityWrapper<AgvSite>().eq("status", 1));
+        ArrayList<AgvSiteListVo> agvSiteListVos = new ArrayList<>();
+        for (AgvSite agvSite : agvSites) {
+            AgvSiteListVo agvSiteListVo = new AgvSiteListVo();
+            agvSiteListVo.setAgvSite(agvSite);
+            if (Cools.isEmpty(agvSite.getWorkNo())){
+                continue;
+            }
+            WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", agvSite.getWorkNo()));
+            if (null == wrkMast){
+               continue;
+            }
+            List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", agvSite.getWorkNo()));
+            agvSiteListVo.setWrkDetls(wrkDetls);
+            agvSiteListVos.add(agvSiteListVo);
+        }
+        return R.ok(agvSiteListVos);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public R lineCall(Map<String, Object> map) {
+        String orgSite =  map.get("orgSite").toString();
+        String tarSite = map.get("tarSite").toString();
+        if (Cools.isEmpty(orgSite) || Cools.isEmpty(tarSite)) {
+            return R.error("鏁版嵁涓虹┖");
+        }
+        AgvSite orgAgvSite = agvSiteService.selectOne(new EntityWrapper<AgvSite>().eq("name", orgSite));
+
+        AgvSite tarAgvSite = agvSiteService.selectOne(new EntityWrapper<AgvSite>().eq("name", tarSite));
+        if (Cools.isEmpty(orgAgvSite) || Cools.isEmpty(tarAgvSite)) {
+            return R.error("绔欑偣鏁版嵁閿欒");
+        }
+
+        //鏇存柊tar绔欑偣鐘舵��
+        tarAgvSite.setWorkNo(orgAgvSite.getWorkNo());
+        tarAgvSite.setStatus(2);
+        if (!agvSiteService.updateById(tarAgvSite)){
+            throw new CoolException("鍙枡绔欐洿鏂板け璐�");
+        }
+        //鏇存柊org绔欑偣鐘舵��
+        orgAgvSite.setStatus(2);
+        if (!agvSiteService.updateById(orgAgvSite)){
+            throw new CoolException("婧愮珯鏇存柊澶辫触");
+        }
+
+        //鍛煎彨agv
+//        boolean success = sendAgvTask(orgSite, tarSite);
+//        if (!success){
+//            throw new CoolException("鍛煎彨agv澶辫触");
+//        }
+
+        return R.ok();
+    }
+
     public void uploadErp(InventoryErpParam param){
         String response = "";
         boolean success = false;
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 06e5b85..887fefd 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -181,8 +181,13 @@
         if (!locDetlDtos.isEmpty()) {
             LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
             if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") ){
-                // 鍚姩鍑哄簱寮�濮� 101.鍑哄簱
-                stockOut(staNo, locDetlDtos, null, userId);
+                if (locMast.getCrnNo() == 7){
+                    stockOutSXK(staNo, locDetlDtos, null, userId);
+                }else {
+                    // 鍚姩鍑哄簱寮�濮� 101.鍑哄簱
+                    stockOut(staNo, locDetlDtos, null, userId);
+                }
+
             }else {
                 throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篎銆丏鐨勫簱浣嶏紝搴撲綅鍙凤細"+locMast.getLocNo()+" 銆佸綋鍓嶇姸鎬侊細"+locMast.getLocSts()+"-"+locMast.getLocSts$());
             }
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index bd12527..bf906af 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -20,7 +20,7 @@
         generator.url="127.0.0.1:1433;databasename=jxgtasrs";
         generator.username="sa";
         generator.password="sa@123";
-        generator.table="man_Inventory_check_order_detl";
+        generator.table="man_agv_site";
         generator.packagePath="com.zy.asrs";
         generator.build();
     }
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 0875990..8786bf6 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -656,7 +656,7 @@
                     continue;
                 }
                 for (LocMast locMastGro1 : locMasts1) {
-                    if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q") || locMastGro1.getLocSts().equals("R") || locMastGro1.getLocSts().equals("X")) {
+                    if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q") || locMastGro1.getLocSts().equals("S") || locMastGro1.getLocSts().equals("R") || locMastGro1.getLocSts().equals("X")) {
                         break;
                     }
                     if (locMastGro1.getLocSts().equals("O")) {
@@ -675,6 +675,12 @@
                 times = times + 1;
                 return getLocNoRun4(whsType, staDescId, sourceStaNo, matnr, batch, grade, moveCrnNo, locTypeDto, times, mixture);
             }
+            // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
+            if (locTypeDto.getLocType1() < 2) {
+                int i = locTypeDto.getLocType1() + 1;
+                locTypeDto.setLocType1((short) i);
+                return getLocNoRun4(whsType, staDescId, sourceStaNo, matnr, batch, grade, moveCrnNo, locTypeDto, 0, mixture);
+            }
             log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
             throw new CoolException("娌℃湁绌哄簱浣�");
         }
diff --git a/src/main/resources/mapper/AgvSiteMapper.xml b/src/main/resources/mapper/AgvSiteMapper.xml
new file mode 100644
index 0000000..c75be5f
--- /dev/null
+++ b/src/main/resources/mapper/AgvSiteMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.mapper.AgvSiteMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.AgvSite">
+        <id column="id" property="id" />
+        <result column="name" property="name" />
+        <result column="code" property="code" />
+        <result column="area" property="area" />
+        <result column="work_no" property="workNo" />
+        <result column="status" property="status" />
+
+    </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/agvSite/agvSite.js b/src/main/webapp/static/js/agvSite/agvSite.js
new file mode 100644
index 0000000..4c645db
--- /dev/null
+++ b/src/main/webapp/static/js/agvSite/agvSite.js
@@ -0,0 +1,250 @@
+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;
+
+    // 鏁版嵁娓叉煋
+    tableIns = table.render({
+        elem: '#agvSite',
+        headers: {token: localStorage.getItem('token')},
+        url: baseUrl+'/agvSite/list/auth',
+        page: true,
+        limit: 15,
+        limits: [15, 30, 50, 100, 200, 500],
+        toolbar: '#toolbar',
+        cellMinWidth: 50,
+        height: 'full-120',
+        cols: [[
+            {type: 'checkbox'}
+            // ,{field: 'id', align: 'center',title: 'ID'}
+            ,{field: 'name', align: 'center',title: '绔欑偣鍚嶇О'}
+            ,{field: 'code', align: 'center',title: '缂栫爜'}
+            ,{field: 'area', align: 'center',title: '鍖哄煙'}
+            ,{field: 'workNo', align: 'center',title: '宸ヤ綔鍙�'}
+            ,{field: 'status$', align: 'center',title: '鐘舵��'}
+
+            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+        ]],
+        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;
+            limit();
+        }
+    });
+
+    // 鐩戝惉鎺掑簭浜嬩欢
+    table.on('sort(agvSite)', function (obj) {
+        var searchData = {};
+        $.each($('#search-box [name]').serializeArray(), function() {
+            searchData[this.name] = this.value;
+        });
+        searchData['orderByField'] = obj.field;
+        searchData['orderByType'] = obj.type;
+        tableIns.reload({
+            where: searchData,
+            page: {curr: 1}
+        });
+    });
+
+    // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+    table.on('toolbar(agvSite)', function (obj) {
+        var checkStatus = table.checkStatus(obj.config.id).data;
+        switch(obj.event) {
+            case 'addData':
+                showEditModel();
+                break;
+            case 'deleteData':
+               if (checkStatus.length === 0) {
+                   layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+                   return;
+               }
+               del(checkStatus.map(function (d) {
+                   return d.id;
+               }));
+               break;
+            case 'exportData':
+                admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+                    var titles=[];
+                    var fields=[];
+                    obj.config.cols[0].map(function (col) {
+                        if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+                            titles.push(col.title);
+                            fields.push(col.field);
+                        }
+                    });
+                    var exportData = {};
+                    $.each($('#search-box [name]').serializeArray(), function() {
+                        exportData[this.name] = this.value;
+                    });
+                    var param = {
+                        'agvSite': exportData,
+                        'fields': fields
+                    };
+                    $.ajax({
+                        url: baseUrl+"/agvSite/export/auth",
+                        headers: {'token': localStorage.getItem('token')},
+                        data: JSON.stringify(param),
+                        dataType:'json',
+                        contentType:'application/json;charset=UTF-8',
+                        method: 'POST',
+                        success: function (res) {
+                            layer.closeAll();
+                            if (res.code === 200) {
+                                table.exportFile(titles,res.data,'xls');
+                            } else if (res.code === 403) {
+                                top.location.href = baseUrl+"/";
+                            } else {
+                                layer.msg(res.msg, {icon: 2})
+                            }
+                        }
+                    });
+                });
+                break;
+        }
+    });
+
+    // 鐩戝惉琛屽伐鍏蜂簨浠�
+    table.on('tool(agvSite)', function(obj){
+        var data = obj.data;
+        switch (obj.event) {
+            case 'edit':
+                showEditModel(data);
+                break;
+            case "del":
+                del([data.id]);
+                break;
+        }
+    });
+
+    /* 寮圭獥 - 鏂板銆佷慨鏀� */
+    function showEditModel(mData) {
+        admin.open({
+            type: 1,
+            area: '600px',
+            title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+            content: $('#editDialog').html(),
+            success: function (layero, dIndex) {
+                layDateRender(mData);
+                form.val('detail', mData);
+                form.on('submit(editSubmit)', function (data) {
+                    var loadIndex = layer.load(2);
+                    $.ajax({
+                        url: baseUrl+"/agvSite/"+(mData?'update':'add')+"/auth",
+                        headers: {'token': localStorage.getItem('token')},
+                        data: data.field,
+                        method: 'POST',
+                        success: function (res) {
+                            layer.close(loadIndex);
+                            if (res.code === 200){
+                                layer.close(dIndex);
+                                layer.msg(res.msg, {icon: 1});
+                                tableReload();
+                            } else if (res.code === 403){
+                                top.location.href = baseUrl+"/";
+                            }else {
+                                layer.msg(res.msg, {icon: 2});
+                            }
+                        }
+                    })
+                    return false;
+                });
+                $(layero).children('.layui-layer-content').css('overflow', 'visible');
+                layui.form.render('select');
+            }
+        });
+    }
+
+    /* 鍒犻櫎 */
+    function del(ids) {
+        layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+            skin: 'layui-layer-admin',
+            shade: .1
+        }, function (i) {
+            layer.close(i);
+            var loadIndex = layer.load(2);
+            $.ajax({
+                url: baseUrl+"/agvSite/delete/auth",
+                headers: {'token': localStorage.getItem('token')},
+                data: {ids: ids},
+                method: 'POST',
+                success: function (res) {
+                    layer.close(loadIndex);
+                    if (res.code === 200){
+                        layer.msg(res.msg, {icon: 1});
+                        tableReload();
+                    } else if (res.code === 403){
+                        top.location.href = baseUrl+"/";
+                    } else {
+                        layer.msg(res.msg, {icon: 2});
+                    }
+                }
+            })
+        });
+    }
+
+    // 鎼滅储
+    form.on('submit(search)', function (data) {
+        pageCurr = 1;
+        tableReload(false);
+    });
+
+    // 閲嶇疆
+    form.on('submit(reset)', function (data) {
+        pageCurr = 1;
+        clearFormVal($('#search-box'));
+        tableReload(false);
+    });
+
+    // 鏃堕棿閫夋嫨鍣�
+    function layDateRender(data) {
+        setTimeout(function () {
+            layDate.render({
+                elem: '.layui-laydate-range'
+                ,type: 'datetime'
+                ,range: true
+            });
+
+        }, 300);
+    }
+    layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+    parent.layer.closeAll();
+});
+
+function tableReload(child) {
+    var searchData = {};
+    $.each($('#search-box [name]').serializeArray(), function() {
+        searchData[this.name] = this.value;
+    });
+    tableIns.reload({
+        where: searchData,
+        page: {curr: pageCurr}
+     });
+}
diff --git a/src/main/webapp/views/agvSite/agvSite.html b/src/main/webapp/views/agvSite/agvSite.html
new file mode 100644
index 0000000..a5d3d87
--- /dev/null
+++ b/src/main/webapp/views/agvSite/agvSite.html
@@ -0,0 +1,121 @@
+<!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">
+</head>
+<body>
+
+<div class="layui-fluid">
+    <div class="layui-card">
+        <div class="layui-card-body">
+            <div class="layui-form toolbar" id="search-box">
+                <div class="layui-form-item">
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="id" 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="create_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 class="layui-inline">&emsp;
+                        <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+                            <i class="layui-icon">&#xe615;</i>鎼滅储
+                        </button>
+                        <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+                            <i class="layui-icon">&#xe666;</i>閲嶇疆
+                        </button>
+                    </div>
+                </div>
+            </div>
+            <table class="layui-hide" id="agvSite" lay-filter="agvSite"></table>
+        </div>
+    </div>
+</div>
+
+<script type="text/html" id="toolbar">
+    <div class="layui-btn-container">
+        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+
+    </div>
+</script>
+
+<script type="text/html" id="operate">
+    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+</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/agvSite/agvSite.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+    <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+        <input name="id" type="hidden">
+        <div class="layui-row">
+            <div class="layui-col-md12">
+                <div class="layui-form-item">
+                    <label class="layui-form-label">绔欑偣鍚嶇О: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="name" placeholder="璇疯緭鍏�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">缂栫爜: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="code" placeholder="璇疯緭鍏�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">鍖哄煙: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="area" placeholder="璇疯緭鍏�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">宸ヤ綔鍙�: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="workNo" placeholder="璇疯緭鍏�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">鐘舵��: </label>
+                    <div class="layui-input-block">
+
+                        <select name="status">
+                            <option value="0">绌洪棽</option>
+                            <option value="1">鍗犵敤</option>
+                            <option value="2">棰勭害</option>
+                        </select>
+                    </div>
+                </div>
+
+             </div>
+        </div>
+        <hr class="layui-bg-gray">
+        <div class="layui-form-item text-right">
+            <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+        </div>
+    </form>
+</script>
+</html>
+

--
Gitblit v1.9.1