1

ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -1,9 +1,11 @@
 package com.ruoyi;
 
+import java.security.Security;
+import java.util.Arrays;
+import java.util.stream.Collectors;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
@@ -17,6 +19,7 @@ public class RuoYiApplication
 {
     public static void main(String[] args)
     {
+        enableSqlServerLegacyTls();
         // System.setProperty("spring.devtools.restart.enabled", "false");
         SpringApplication.run(RuoYiApplication.class, args);
         System.out.println("""
@@ -24,4 +27,25 @@ public class RuoYiApplication
                             This is a text block with Unicode characters.
                 """);
     }
+
+    private static void enableSqlServerLegacyTls()
+    {
+        if (!Boolean.parseBoolean(System.getProperty("ruoyi.sqlserver.legacyTls.enabled", "true")))
+        {
+            return;
+        }
+
+        String propertyName = "jdk.tls.disabledAlgorithms";
+        String disabledAlgorithms = Security.getProperty(propertyName);
+        if (disabledAlgorithms == null || disabledAlgorithms.isBlank())
+        {
+            return;
+        }
+
+        String compatibleAlgorithms = Arrays.stream(disabledAlgorithms.split(","))
+                .map(String::trim)
+                .filter(algorithm -> !"TLSv1".equalsIgnoreCase(algorithm))
+                .collect(Collectors.joining(", "));
+        Security.setProperty(propertyName, compatibleAlgorithms);
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java

@@ -1,13 +1,19 @@
 package com.ruoyi.api.controller;
 
+import cn.hutool.json.JSONUtil;
+import com.ruoyi.api.moveMsg.domain.MoveMsg;
 import com.ruoyi.api.service.IToErpService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.log.service.IRequestLogService;
+import com.ruoyi.pda.mapper.PdaMapper;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.*;
 
 import com.ruoyi.api.domain.DeliveryNoticeVo;
 
+import java.util.HashMap;
+
 /**
  * 作业统计 Controller
  */
@@ -19,6 +25,8 @@ public class ToErpApiController {
     private IToErpService toErpService;
     @Autowired
     private IRequestLogService requestLogService;
+    @Autowired
+    private PdaMapper pdaMapper;
 
     /**
      * 接收入出库通知单
@@ -28,7 +36,7 @@ public class ToErpApiController {
     public AjaxResult receiveDeliveryNotice(@RequestBody DeliveryNoticeVo deliveryNoticeVo) {
 
         AjaxResult ajaxResult = toErpService.receiveDeliveryNotice(deliveryNoticeVo);
-        requestLogService.insertRequestLog(requestLogService.getRequestLog(deliveryNoticeVo.toString(), "接收入出库通知单", ajaxResult));
+        requestLogService.insertRequestLog(requestLogService.getRequestLogERP(JSONUtil.toJsonStr(deliveryNoticeVo), "接收入出库通知单", ajaxResult));
         return ajaxResult;
 
 
@@ -36,22 +44,107 @@ public class ToErpApiController {
 
 
     /**
-     * 回传其他入库单
+     * 回传入库单
      */
-//    @Scheduled(fixedDelay = 1500)
+    @Scheduled(fixedDelay = 1500)
     @RequestMapping("/callbackInDeliveryNotice")
     @ResponseBody
-    public void callbackInDeliveryNotice() {
-        toErpService.callbackInDeliveryNotice();
+    public void callbackInDeliveryNoticeNew() {
+        toErpService.callbackInDeliveryNoticeNew();
+    }
+
+
+    /**
+     * 回传出库单(新)
+     */
+    @Scheduled(fixedDelay = 1500)
+    @RequestMapping("/callbackOutDeliveryNotice")
+    @ResponseBody
+    public void callbackDeliveryOutNoticeNew() {
+        toErpService.callbackDeliveryOutNoticeNew();
+    }
+
+
+//    @Scheduled(fixedDelay = 1500)
+//    @RequestMapping("/callbackOutDeliveryNotice")
+//    @ResponseBody
+//    public void callbackDeliveryOutNoticeNewS() {
+//        toErpService.callbackDeliveryOutNoticeNews();
+//    }
+
+
+
+
+
+//    /**
+//     * 回传其他入库单
+//     */
+//    @Scheduled(fixedDelay = 1500)
+//    @RequestMapping("/callbackInDeliveryNotice")
+//    @ResponseBody
+//    public void callbackInDeliveryNotice() {
+//        toErpService.callbackInDeliveryNotice();
+//    }
+//
+//    /**
+//     * 回传其他出库单
+//     */
+//    @Scheduled(fixedDelay = 1500)
+//    @RequestMapping("/callbackOutDeliveryNotice")
+//    @ResponseBody
+//    public void callbackDeliveryOutNotice() {
+//        toErpService.callbackoutDeliveryNotice();
+//    }
+
+    /**
+     * 移库回调接口
+     */
+    @Scheduled(fixedDelay = 1500)
+    @RequestMapping("/moveCargoSpace")
+    @ResponseBody
+    public void moveCargoSpace() {
+        toErpService.moveCargoSpace();
     }
 
     /**
-     * 回传其他出库单
+     * 自动确认入库单据
      */
-    @RequestMapping("/callbackOutDeliveryNotice")
+    @Scheduled(fixedDelay = 10000)
+//    @RequestMapping("/FillFinishAllot")
     @ResponseBody
-    public void callbackDeliveryOutNotice() {
-        toErpService.callbackoutDeliveryNotice();
+    public void FillFinishAllot() {
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("v_result", null);
+        map.put("v_result_msg", null);
+        pdaMapper.FillFinishAllot(map);
+        String result = map.get("v_result").toString();
+        String msg = map.get("v_result_msg").toString();
+        if ("10".equals(result)) {
+            System.err.println(msg);
+        } else {
+//            System.err.println(msg);
+        }
+    }
+    /**
+     * 自动确认出库单据
+     */
+    @Scheduled(fixedDelay = 10000)
+//    @RequestMapping("/FillFinishAllot")
+    @ResponseBody
+    public void FillFinishAllotOut() {
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("v_result", null);
+        map.put("v_result_msg", null);
+        pdaMapper.FillFinishAllotOut(map);
+        String result = map.get("v_result").toString();
+        String msg = map.get("v_result_msg").toString();
+        if ("10".equals(result)) {
+            System.err.println(msg);
+        } else {
+//            System.err.println(msg);
+        }
     }
 
+
+
 }

ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.api.controller;
 
+import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.ruoyi.api.domain.ErpProduct;
 import com.ruoyi.api.domain.ReMaterialParam;
@@ -11,6 +12,10 @@ import com.ruoyi.bas.BasProduct.service.IBasProductService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.device.agv.domain.AgvContainerTask;
+import com.ruoyi.device.agv.service.IAgvContainerTaskService;
+import com.ruoyi.job.mydojob.domain.MydoJob;
+import com.ruoyi.job.mydojob.mapper.MydoJobMapper;
 import com.ruoyi.log.domain.RequestLog;
 import com.ruoyi.log.service.IRequestLogService;
 import com.ruoyi.out.outStockout.domain.OutStockoutVo;
@@ -19,7 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Map;
+import java.util.*;
 
 /**
  * 作业统计 Controller
@@ -36,6 +41,10 @@ public class ToWmsApiController {
     private IOutStockoutService outStockoutService;
     @Autowired
     private IBasProductService basProductService;
+    @Autowired
+    private MydoJobMapper mapper;
+    @Autowired
+    private IAgvContainerTaskService agvContainerTaskService;
 
     /**
      * 入库请求生成作业
@@ -43,18 +52,50 @@ public class ToWmsApiController {
     @PostMapping("/requestEnterByTrayCode")
     public AjaxResult requestEnterByTrayCode(@RequestBody RequestEnter requestEnter) {
         AjaxResult ajaxResult = toWmsService.requestEnterByTrayCode(requestEnter);
-        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(requestEnter), "入库任务创建请求",ajaxResult);
+        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(requestEnter), "入库任务创建请求", ajaxResult);
         requestLogService.insertRequestLog(requestLog);
         return ajaxResult;
     }
 
+    // 入库分货位
+    @PostMapping("/sendCargoSpace")
+    public AjaxResult sendCargoSpace(@RequestBody RequestEnter requestEnter) {
+        AjaxResult ajaxResult = toWmsService.requestEnterByTaskNo(requestEnter);
+        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(requestEnter), "入库请求分配货位", ajaxResult);
+        requestLogService.insertRequestLog(requestLog);
+        return ajaxResult;
+    }
+
+
+    // 出库到位更新LED显示屏
+    @PostMapping("/updateLed")
+    public AjaxResult updateLed(@RequestBody RequestEnter requestEnter) {
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("v_task_no", requestEnter.getTaskNo());
+        map.put("v_code", requestEnter.getDeviceCode());
+        mapper.updateLed(map);
+        return AjaxResult.success();
+    }
+
+
+    // 线体报警更新报警信息
+    @PostMapping("/updateLedError")
+    public AjaxResult updateLedError(@RequestBody RequestEnter requestEnter) {
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("v_code", requestEnter.getDeviceCode());
+        map.put("v_error_code", requestEnter.getErrorCode());
+        mapper.updateLedError(map);
+        return AjaxResult.success();
+    }
+
+
     /**
      * 请求补码作业
      */
     @RequestMapping("/requestByNoTrayCode")
     public AjaxResult requestByNoTrayCode(@RequestBody RequestEnter requestEnter) {
         AjaxResult ajaxResult = toWmsService.selectMydoJobByEntranceId(requestEnter);
-        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(requestEnter), "请求补码作业",ajaxResult);
+        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(requestEnter), "请求补码作业", ajaxResult);
         requestLogService.insertRequestLog(requestLog);
         return ajaxResult;
     }
@@ -65,7 +106,7 @@ public class ToWmsApiController {
     @RequestMapping("/requestEnterByTrayCodeAndEntranceId")
     public AjaxResult requestEnterByTrayCodeAndEntranceId(@RequestBody RequestEnter requestEnter) {
         AjaxResult ajaxResult = toWmsService.requestEnterByTrayCodeAndEntranceId(requestEnter);
-        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(requestEnter), "获取入库作业",ajaxResult);
+        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(requestEnter), "获取入库作业", ajaxResult);
         requestLogService.insertRequestLog(requestLog);
         return ajaxResult;
     }
@@ -74,18 +115,17 @@ public class ToWmsApiController {
     /**
      * 入库、出库 任务完成回传
      * Map<String, String>
-     *     "wmsType": "任务类型" 1-入库 2-出库 3-agv搬运,
-     *      taskNo：出库 入库任务号
-     *      trayCode:托盘码
-     *      positionCode1：起点
-     *      positionCode2：终点
-     *      containerCode：容器编码
-     *
+     * "wmsType": "任务类型" 1-入库 2-出库 3-agv搬运,
+     * taskNo：出库 入库任务号
+     * trayCode:托盘码
+     * positionCode1：起点
+     * positionCode2：终点
+     * containerCode：容器编码
      */
     @PostMapping("/jobFinish")
     public AjaxResult jobFinish(@RequestBody WmsJobRequest wmsJobRequest) {
         AjaxResult ajaxResult = toWmsService.jobFinish(wmsJobRequest);
-        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(wmsJobRequest), "jobFinish",ajaxResult);
+        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(wmsJobRequest), "jobFinish", ajaxResult);
         requestLogService.insertRequestLog(requestLog);
         return ajaxResult;
     }
@@ -96,7 +136,7 @@ public class ToWmsApiController {
     @PostMapping("/reAssign")
     public AjaxResult reAssign(@RequestBody ReMaterialParam reMaterialParam) {
         AjaxResult ajaxResult = toWmsService.reAssign(reMaterialParam);
-        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(reMaterialParam), "reAssign",ajaxResult);
+        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(reMaterialParam), "reAssign", ajaxResult);
         requestLogService.insertRequestLog(requestLog);
         return ajaxResult;
     }
@@ -107,13 +147,12 @@ public class ToWmsApiController {
     @PostMapping("/reMaterial")
     public AjaxResult reMaterial(@RequestBody ReMaterialParam reMaterialParam) {
         AjaxResult ajaxResult = toWmsService.reMaterial(reMaterialParam);
-        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(reMaterialParam), "reMaterial",ajaxResult);
+        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(reMaterialParam), "reMaterial", ajaxResult);
         requestLogService.insertRequestLog(requestLog);
         return ajaxResult;
     }
 
 
-
     /**
      * 出库单据保存
      *
@@ -137,8 +176,7 @@ public class ToWmsApiController {
      */
     @Log(title = "接收物料", businessType = BusinessType.INSERT)
     @PutMapping("/receiveProduct")
-    public AjaxResult receiveProduct(@RequestBody ErpProduct erpProduct)
-    {
+    public AjaxResult receiveProduct(@RequestBody ErpProduct erpProduct) {
         AjaxResult ajaxResult = toWmsService.receiveProduct(erpProduct);
         RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(erpProduct), "接收物料", ajaxResult);
         requestLogService.insertRequestLog(requestLog);
@@ -150,8 +188,7 @@ public class ToWmsApiController {
      */
     @Log(title = "修改物料管理", businessType = BusinessType.UPDATE)
     @PutMapping("/updateProduct")
-    public AjaxResult updateProduct(@RequestBody ErpProduct erpProduct)
-    {
+    public AjaxResult updateProduct(@RequestBody ErpProduct erpProduct) {
         AjaxResult ajaxResult = toWmsService.updateProduct(erpProduct);
         RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(erpProduct), "修改物料管理", ajaxResult);
         requestLogService.insertRequestLog(requestLog);
@@ -163,12 +200,76 @@ public class ToWmsApiController {
      */
     @Log(title = "作废物料", businessType = BusinessType.UPDATE)
     @PutMapping("/InvalidProduct")
-    public AjaxResult InvalidProduct(@RequestBody ErpProduct erpProduct)
-    {
+    public AjaxResult InvalidProduct(@RequestBody ErpProduct erpProduct) {
         AjaxResult ajaxResult = toWmsService.InvalidProduct(erpProduct);
         RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(erpProduct), "作废物料", ajaxResult);
         requestLogService.insertRequestLog(requestLog);
         return ajaxResult;
     }
 
+    /**
+     * 请求AGV执行队列
+     */
+//    @Log(title = "请求未下发的AGV执行队列", businessType = BusinessType.OTHER)
+    @RequestMapping("/queryAgvQuene")
+    public AjaxResult queryAgvQuene() {
+        AgvContainerTask agvContainerTask = new AgvContainerTask();
+        agvContainerTask.setStatus("0");
+        List<AgvContainerTask> agvContainerTasks = agvContainerTaskService.selectAgvContainerTaskList(agvContainerTask);
+        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(""), "请求未下发的AGV执行队列", AjaxResult.success(agvContainerTasks));
+        requestLogService.insertRequestLog(requestLog);
+        if (agvContainerTasks != null && agvContainerTasks.size() > 0) {
+            for (AgvContainerTask containerTask : agvContainerTasks) {
+                containerTask.setStatus("1");
+                agvContainerTaskService.updateAgvContainerTask(containerTask);
+            }
+            return AjaxResult.success(agvContainerTasks.get(0));
+        } else {
+            return AjaxResult.error("无队列");
+        }
+    }
+
+
+    /**
+     * 请求AGV执行队列
+     */
+    @Log(title = "完成AGV执行队列", businessType = BusinessType.UPDATE)
+    @RequestMapping("/finishAgvQuene")
+    public AjaxResult finishAgvQuene(@RequestBody JSONObject jsonObject) {
+        String order = (String) jsonObject.get("order");
+        agvContainerTaskService.deleteAgvJobByOrder(order);
+        return AjaxResult.success();
+
+    }
+
+
+    @Log(title = "自动生成Agv搬运队列到线边", businessType = BusinessType.INSERT)
+    @PutMapping("/insertAgvQuene")
+    public AjaxResult insertAgvQuene(@RequestBody WmsJobRequest wmsJobRequest) {
+        String taskNo = wmsJobRequest.getTaskNo();// 到位任务号
+        String code = wmsJobRequest.getCode();// 线体号
+        AgvContainerTask agvContainerTask = new AgvContainerTask();
+        agvContainerTask.setTaskNo(taskNo);
+        List<AgvContainerTask> agvContainerTasks = agvContainerTaskService.selectAgvContainerTaskList(agvContainerTask);
+        if (Objects.isNull(agvContainerTasks)) {
+            MydoJob mydoJob = new MydoJob();
+            mydoJob.setTaskNo(taskNo);
+            List<MydoJob> mydoJobs = mapper.selectMydoJobList(mydoJob);
+            AgvContainerTask agvContainerTask1 = new AgvContainerTask();
+            agvContainerTask1.setContainer(UUID.randomUUID().toString());
+            agvContainerTask1.setTaskNo(taskNo);
+            agvContainerTask1.setStartPoint(code);
+            agvContainerTask1.setEndPoint(mydoJobs.get(0).getEndPoint());//TODO 需要修改
+            agvContainerTask1.setSpare2(mydoJobs.get(0).getTrayCode());
+            // 10缓存区到线边 11立库到线边 12 立库到缓存区 13 缓存到立库
+            agvContainerTask1.setSpare1("11");
+            agvContainerTask1.setStatus("0");
+            agvContainerTaskService.insertAgvContainerTask(agvContainerTask1);
+        }
+        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(wmsJobRequest), "自动生成Agv搬运队列到线边", AjaxResult.success());
+        requestLogService.insertRequestLog(requestLog);
+        return AjaxResult.success();
+    }
+
+
 }

ruoyi-admin/src/main/java/com/ruoyi/api/controller/TwinController.java

@@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.annotation.Anonymous;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -23,6 +24,7 @@ public class TwinController {
     @Autowired
     private ITwinService twinService;
 
+    //获取所有货位
     @Anonymous
     @GetMapping("/getEmptyCargoSpace")
     public AjaxResult getEmptyCargoSpace() {
@@ -30,10 +32,25 @@ public class TwinController {
         return AjaxResult.success(list);
     }
 
+    //获取统计信息
     @Anonymous
     @GetMapping("/getStockList")
     public Map<String, Object> getStockList() {
         return twinService.getStockListOverview();
     }
 
+    //根据货位号获取库存中的物料信息
+    @Anonymous
+    @GetMapping("/getCargo/{cargoSpaceName}")
+    public Map<String, Object> getCargo(@PathVariable("cargoSpaceName") String cargoSpaceName) {
+        return twinService.getCargo(cargoSpaceName);
+    }
+
+    //根据任务号获取作业表中的物料信息
+    @Anonymous
+    @GetMapping("/getTaskCargo/{taskNo}")
+    public Map<String, Object> getTaskCargo(@PathVariable("taskNo") String taskNo) {
+        return twinService.getTaskCargo(taskNo);
+    }
+
 }

ruoyi-admin/src/main/java/com/ruoyi/api/domain/DeliveryNoticeItemVo.java

@@ -4,6 +4,9 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
+import org.w3c.dom.stylesheets.LinkStyle;
+
+import java.util.List;
 
 /**
  * 出入库通知单-子表接收对象
@@ -42,7 +45,38 @@ public class DeliveryNoticeItemVo {
     /** 备注 */
     private String remark;
 
+    private List<LocationDetail> locations;
+    /**货位*/
     private String area;
-
+   /**托盘*/
     private String location;
+
+    private String areaBefore;
+
+    private String locationBefore;
+    /** 项目号 */
+    private String projectNo;
+    /**
+     * erp子表主键
+     ***/
+    private String sourceLineId;
+    /**
+     * 条码号
+     ***/
+    private String barCode;
+    /**
+     * 是否批次管理
+     **/
+    private String isBatchManage;
+
+    /**旧项目号**/
+    private String oldProjectNo;
+    /**组件号**/
+    private String groupNum;
+
+
+    /**存放地点  1 立库 2平库*/
+    private String stg_location;
+
+
 }

ruoyi-admin/src/main/java/com/ruoyi/api/domain/DeliveryNoticeVo.java

@@ -49,6 +49,17 @@ public class DeliveryNoticeVo {
     private String warehouseId;
     /** 备注 */
     private String remark;
+    /** 配送终点 */
+    private String destination;
+    /** 领料车间 */
+    private String workshop;
+
+
+    private String companyShortName;
+    /** 账套号**/
+    private String accountSetNo;
     /** 子表明细列表 */
+
+
     private List<DeliveryNoticeItemVo> detailList;
 }

ruoyi-admin/src/main/java/com/ruoyi/api/domain/RequestEnter.java

@@ -20,4 +20,8 @@ public class RequestEnter {
     private  String type;
 
     private String flag;
+    private String taskNo;
+    private String deviceCode;
+    private String code;
+    private String errorCode;
 }

ruoyi-admin/src/main/java/com/ruoyi/api/domain/WmsJobRequest.java

@@ -24,4 +24,6 @@ public class WmsJobRequest {
     private String positionCode2;
     //任务id
     private String jobId;
+    //线体号
+    private String code;
 }

ruoyi-admin/src/main/java/com/ruoyi/api/service/IToErpService.java

@@ -1,6 +1,7 @@
 package com.ruoyi.api.service;
 
 import com.ruoyi.api.domain.DeliveryNoticeVo;
+import com.ruoyi.api.moveMsg.domain.MoveMsg;
 import com.ruoyi.bas.BasProduct.domain.BasProduct;
 import com.ruoyi.common.core.domain.AjaxResult;
 
@@ -16,5 +17,13 @@ public interface IToErpService {
 
     void callbackoutDeliveryNotice();
 
+    void moveCargoSpace();
+
     AjaxResult createWorkshopInboundOrder(BasProduct basProduct);
+
+    void callbackInDeliveryNoticeNew();
+
+    void callbackDeliveryOutNoticeNew();
+
+    void callbackDeliveryOutNoticeNews();
 }

ruoyi-admin/src/main/java/com/ruoyi/api/service/IToWmsService.java

@@ -59,4 +59,6 @@ public interface IToWmsService {
      * 作废物料
      */
     AjaxResult InvalidProduct(ErpProduct erpProduct);
+
+    AjaxResult requestEnterByTaskNo(RequestEnter requestEnter);
 }

ruoyi-admin/src/main/java/com/ruoyi/api/service/ITwinService.java

@@ -4,5 +4,7 @@ import java.util.Map;
 
 public interface ITwinService {
     Map<String, Object> getStockListOverview();
+    Map<String, Object> getCargo(String cargoSpaceName);
+    Map<String, Object> getTaskCargo(String taskNo);
 }
 

ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java

@@ -33,7 +33,7 @@ public class ToWcsServiceImpl implements IToWcsService {
     @Autowired
     private IAgvContainerTaskService agvContainerTaskService;
 
-    public static final String PUSH_OUT_MYDO_JOB = "http://localhost:8081/wcs2Wms/api/receiveOutMydoJob";
+    public static final String PUSH_OUT_MYDO_JOB = "http://192.168.188.236:8081/wcs2Wms/api/receiveOutMydoJob";
     public static final String PUSH_IN_MYDO_JOB = "http://localhost:8081/wcs2Wms/api/receiveInMydoJob";
     public static final String PUSH_AGV_MOVE_JOB = "http://localhost:8081/agv/api/receiveAgvMoveJob";
     public static final String OUT_MYDOJOB_MS = "http://localhost:8081/wcs2Wms/api/outMydojobMakesure";
@@ -43,15 +43,12 @@ public class ToWcsServiceImpl implements IToWcsService {
 
 
     @Override
-//    @Scheduled(fixedDelay=1500)
+    @Scheduled(fixedDelay=1500)
     public void pushOutMydoJob() {
         //查询所有未推送的料箱出库作业
         MydoJob mydoJobParam = new MydoJob();
         mydoJobParam.setStatus("1");
-        List<String> list = new ArrayList<>();
-        list.add("21");
-        list.add("26");
-        mydoJobParam.setInOutIds(list);
+        mydoJobParam.setInOut("2");
         List<MydoJob> outMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam);
         for (MydoJob outMydoJob : outMydoJobs) {
             RequestLog requestLog = requestLogService.getRequestLog(PUSH_OUT_MYDO_JOB, JSONUtil.toJsonStr(outMydoJob), "推送出库任务","wms","wcs");

ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java

@@ -93,27 +93,29 @@ public class ToWmsServiceImpl implements IToWmsService {
 
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public AjaxResult requestEnterByTrayCode(RequestEnter requestEnter) {
 
         String trayCode = requestEnter.getTrayCode();
         MydoJob inJob = mydoJobMapper.selectInJobByTrayCode(trayCode);
         if(inJob != null && Integer.parseInt(inJob.getInOrOut()) < 20){
-            if(inJob.getCargoSpaceId() != null && !"".equals(inJob.getCargoSpaceId())){
-                return AjaxResult.success(JSONUtil.toJsonStr(inJob));
-            }else{
-                //分配货位
-                HashMap<String, Object> map = new HashMap<>();
+//            if(inJob.getCargoSpaceId() != null && !"".equals(inJob.getCargoSpaceId())){
+//                return AjaxResult.success(inJob);
+//            }else{
+//                //分配货位
+//                HashMap<String, Object> map = new HashMap<>();
+//
+//                map.put("v_tray_code", trayCode);
+//                mydoJobMapper.allotInJobSpace(map);
+//                if (!"10".equals(map.get("v_result").toString())) {
+//                    return AjaxResult.error(map.get("v_resultmsg").toString());
+//                }else{
+//
+//                }
+//            }
+
+//            MydoJob inJob2 = mydoJobMapper.selectInJobByTrayCode(trayCode);
+            return AjaxResult.success(inJob);
 
-                map.put("v_tray_code", trayCode);
-                mydoJobMapper.allotInJobSpace(map);
-                if (!"10".equals(map.get("v_result").toString())) {
-                    return AjaxResult.error(map.get("v_resultmsg").toString());
-                }else{
-                    MydoJob inJob2 = mydoJobMapper.selectInJobByTrayCode(trayCode);
-                    return AjaxResult.success(JSONUtil.toJsonStr(inJob2));
-                }
-            }
         }else{
             return AjaxResult.error("该条码无入库任务，请扫码绑定！");
         }
@@ -197,9 +199,20 @@ public class ToWmsServiceImpl implements IToWmsService {
                     return AjaxResult.error("任务不存在");
                 }
                 MydoJob outJob = outMydoJobs.get(0);
+                //出库作业
                 outJob.setExecutionPhase("2");
                 mydoJobService.updateMydoJob(outJob);
                 break;
+            case "7":
+                //移库作业
+                mydoJobParam.setTaskNo(wmsJobRequest.getTaskNo());
+                List<MydoJob> ykMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam);
+                if (ykMydoJobs.isEmpty()) {
+                    return AjaxResult.error("任务不存在");
+                }
+                MydoJob ykJob = ykMydoJobs.get(0);
+                mydoJobService.ykCompleted(ykJob);
+                break;
 
             default:
                 log.error("作业类型错误");
@@ -385,5 +398,32 @@ public class ToWmsServiceImpl implements IToWmsService {
         return AjaxResult.error(erpProduct.getSys_MainId()+"物料不存在");
     }
 
+    @Override
+    public AjaxResult requestEnterByTaskNo(RequestEnter requestEnter) {
+        String taskNo = requestEnter.getTaskNo();
+        String deviceCode = requestEnter.getDeviceCode();
+        MydoJob inJob = mydoJobMapper.selectInJobByTaskNo(taskNo);
+        if(inJob != null && Integer.parseInt(inJob.getInOrOut()) < 20){
+            if(inJob.getCargoSpaceId() != null && !"".equals(inJob.getCargoSpaceId())){
+                return AjaxResult.success(inJob);
+            }else{
+                //分配货位
+                HashMap<String, Object> map = new HashMap<>();
+
+                map.put("v_tray_code", inJob.getTrayCode());
+                map.put("v_code", deviceCode);
+                mydoJobMapper.allotInJobSpace(map);
+                if (!"10".equals(map.get("v_result").toString())) {
+                    return AjaxResult.error(map.get("v_resultmsg").toString());
+                }else{
+                    MydoJob inJob2 = mydoJobMapper.selectInJobByTaskNo(taskNo);
+                    return AjaxResult.success(inJob2);
+                }
+            }
+        }else{
+            return AjaxResult.error("该条码无入库任务，请扫码绑定！");
+        }
+    }
+
 
 }

ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/TwinServiceImpl.java

@@ -5,6 +5,10 @@ import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace;
 import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService;
 import com.ruoyi.in.stockinfinish.domain.InStockinFinish;
 import com.ruoyi.in.stockinfinish.service.IInStockinFinishService;
+import com.ruoyi.job.mydojob.domain.MydoJob;
+import com.ruoyi.job.mydojob.service.IMydoJobService;
+import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail;
+import com.ruoyi.job.mydojobdetail.service.IMydoJobDetailService;
 import com.ruoyi.out.outStockoutFinish.domain.OutStockoutFinish;
 import com.ruoyi.out.outStockoutFinish.service.IOutStockoutFinishService;
 import com.ruoyi.stock.stock.domain.BasStock;
@@ -33,6 +37,10 @@ public class TwinServiceImpl implements ITwinService {
     private IInStockinFinishService inStockinFinishService;
     @Autowired
     private IOutStockoutFinishService outStockoutFinishService;
+    @Autowired
+    private IMydoJobService mydoJobService;
+    @Autowired
+    private IMydoJobDetailService mydoJobDetailService;
 
     @Override
     public Map<String, Object> getStockListOverview() {
@@ -250,4 +258,62 @@ public class TwinServiceImpl implements ITwinService {
         result.put("monthOutStock", monthOutStock);
         return result;
     }
+
+    @Override
+    public Map<String, Object> getCargo(String cargoSpaceName) {
+        BasStock basStock = new BasStock();
+        basStock.setCargoSpaceId(cargoSpaceName);
+        List<BasStock> list = basStockService.selectBasStockList(basStock);
+        List<Map<String, String>> dataList = new ArrayList<>();
+        for (BasStock stock : list) {
+            Map<String, String> dataMap = new HashMap<>();
+            dataMap.put("productId", stock.getProductId());
+            dataMap.put("productName", stock.getProductName());
+            dataMap.put("quantity", stock.getQuantity());
+            dataMap.put("trayCode", stock.getTrayCode());
+            dataList.add(dataMap);
+        }
+        Map<String, Object> result = new HashMap<>();
+        result.put("data", dataList);
+        return result;
+    }
+
+    @Override
+    public Map<String, Object> getTaskCargo(String taskNo) {
+        MydoJob mydoJob = new MydoJob();
+        mydoJob.setTaskNo(taskNo);
+        List<MydoJob> jobList = mydoJobService.selectMydoJobList(mydoJob);
+        List<Map<String, String>> dataList = new ArrayList<>();
+        if (jobList != null && !jobList.isEmpty()) {
+            MydoJob job = jobList.get(0);
+            String jobId = job.getJobId();
+            String inOrOutStr = job.getInOrOut();
+            int inOrOut = 0;
+            try {
+                inOrOut = Integer.parseInt(inOrOutStr);
+            } catch (Exception e) {
+                // Ignore parse error
+            }
+
+            List<MydoJobDetail> details = mydoJobDetailService.selectMydoJobDetailListByJobId(jobId);
+            for (MydoJobDetail detail : details) {
+                Map<String, String> dataMap = new HashMap<>();
+                dataMap.put("productId", detail.getProductId());
+                dataMap.put("productName", detail.getProductName());
+                
+                String quantity = "0";
+                if (inOrOut < 20) {
+                    quantity = detail.getInQuantity();
+                } else {
+                    quantity = detail.getOutQuantity();
+                }
+                dataMap.put("quantity", quantity);
+                dataMap.put("trayCode", detail.getTrayCode());
+                dataList.add(dataMap);
+            }
+        }
+        Map<String, Object> result = new HashMap<>();
+        result.put("data", dataList);
+        return result;
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/controller/BasTraycodeController.java

@@ -71,6 +71,7 @@ public class BasTraycodeController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody BasTraycode basTraycode)
     {
+
         return toAjax(basTraycodeService.insertBasTraycode(basTraycode));
     }
 

ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/domain/BasTraycode.java

@@ -16,16 +16,16 @@ public class BasTraycode extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** id */
-    @Excel(name = "${bas.Traycode.id}")
+//    @Excel(name = "${bas.Traycode.id}")
     private Long id;
 
     /** 条码类型id */
-    @Excel(name = "${bas.Traycode.formatId}")
+//    @Excel(name = "${bas.Traycode.formatId}")
     private Long formatId;
     private String formatName;
 
     /** 条码 */
-    @Excel(name = "${bas.Traycode.trayCode}")
+    @Excel(name = "条码")
     private String trayCode;
 
     /** 备用字段1 */
@@ -33,7 +33,7 @@ public class BasTraycode extends BaseEntity
     private String spare1;
 
     /** 备用字段2 */
-//    @Excel(name = "${bas.Traycode.spare2}")
+    @Excel(name = "是否可用",dictType = "sys_yes_no")
     private String spare2;
 
     /** 备用字段3 */

ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/mapper/BasTraycodeMapper.java

@@ -61,4 +61,6 @@ public interface BasTraycodeMapper
     public int deleteBasTraycodeByIds(Long[] ids);
 
     void insertBasTraycodeList(List<BasTraycode> list);
+
+    Integer selectBasTrayCodeMax();
 }

ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/service/IBasTraycodeService.java

@@ -61,4 +61,6 @@ public interface IBasTraycodeService
     public int deleteBasTraycodeById(Long id);
 
     void insertBasTraycodeList(List<BasTraycode> traycodeList);
+
+    Integer selectBasTrayCodeMax();
 }

ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/service/impl/BasTraycodeServiceImpl.java

@@ -1,9 +1,12 @@
 package com.ruoyi.bas.traycode.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
 import com.ruoyi.bas.traycode.domain.BasTraycode;
 import com.ruoyi.bas.traycode.mapper.BasTraycodeMapper;
 import com.ruoyi.bas.traycode.service.IBasTraycodeService;
+import com.ruoyi.bas.traycodeformat.domain.BasTraycodeFormat;
+import com.ruoyi.bas.traycodeformat.service.IBasTraycodeFormatService;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -21,6 +24,8 @@ public class BasTraycodeServiceImpl implements IBasTraycodeService
 {
     @Autowired
     private BasTraycodeMapper basTraycodeMapper;
+    @Autowired
+    private IBasTraycodeFormatService basTraycodeFormatService;
 
     /**
      * 查询条码信息
@@ -55,8 +60,33 @@ public class BasTraycodeServiceImpl implements IBasTraycodeService
     @Override
     public int insertBasTraycode(BasTraycode basTraycode)
     {
-        basTraycode.setCreateTime(DateUtils.getNowDate());
-        return basTraycodeMapper.insertBasTraycode(basTraycode);
+        try {
+            BasTraycodeFormat basTraycodeFormat = basTraycodeFormatService.selectBasTraycodeFormatById(basTraycode.getFormatId());
+
+
+            int i1 = Integer.parseInt(basTraycode.getSpare1());
+            //如果i<4位数，前面补0
+            String code = "";
+            for (int j = 0; j < i1; j++) {
+                code = String.format("%07d",Convert.toInt( basTraycodeFormat.getSerialRule()) + 1 + j);
+                if(basTraycodeFormat.getMaxNum() < Convert.toLong( code)){
+                    throw new RuntimeException("已生成最大值");
+                }
+                String finalCode = basTraycodeFormat.getBarcodeFormat()+code;
+                basTraycode.setTrayCode(finalCode);
+                basTraycode.setSpare1(null);
+                basTraycode.setCreateTime(DateUtils.getNowDate());
+                basTraycode.setSpare2("Y");
+                basTraycodeMapper.insertBasTraycode(basTraycode);
+
+
+            }
+            basTraycodeFormat.setSerialRule(Convert.toLong( code).toString());
+            basTraycodeFormatService.updateBasTraycodeFormat(basTraycodeFormat);
+        } catch (Exception e) {
+           throw new RuntimeException(e);
+        }
+        return 1;
     }
 
     /**
@@ -103,4 +133,9 @@ public class BasTraycodeServiceImpl implements IBasTraycodeService
             basTraycodeMapper.insertBasTraycodeList(list);
         }
     }
+
+    @Override
+    public Integer selectBasTrayCodeMax() {
+        return basTraycodeMapper.selectBasTrayCodeMax();
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/bas/traycodeformat/service/impl/BasTraycodeFormatServiceImpl.java

@@ -1,17 +1,13 @@
 package com.ruoyi.bas.traycodeformat.service.impl;
 
-import cn.hutool.core.util.StrUtil;
-import com.ruoyi.bas.traycode.domain.BasTraycode;
 import com.ruoyi.bas.traycode.service.IBasTraycodeService;
 import com.ruoyi.bas.traycodeformat.domain.BasTraycodeFormat;
 import com.ruoyi.bas.traycodeformat.mapper.BasTraycodeFormatMapper;
 import com.ruoyi.bas.traycodeformat.service.IBasTraycodeFormatService;
-import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -79,20 +75,7 @@ public class BasTraycodeFormatServiceImpl implements IBasTraycodeFormatService
     public int updateBasTraycodeFormat(BasTraycodeFormat basTraycodeFormat)
     {
         BasTraycodeFormat old = selectBasTraycodeFormatById(basTraycodeFormat.getId());
-        int oldSerialRule = Convert.toInt(old.getSerialRule());
-        int newSerialRule = Convert.toInt(basTraycodeFormat.getSerialRule());
-
-        List<BasTraycode> traycodeList = new ArrayList<>();
-        for (int i = oldSerialRule; i < newSerialRule; i++) {
-            BasTraycode basTraycode = new BasTraycode();
-            basTraycode.setFormatId(basTraycodeFormat.getId());
-            String traycode = old.getBarcodeFormat()+ StrUtil.padPre(Convert.toStr(i),5,'0');
-            basTraycode.setTrayCode(traycode);
-            traycodeList.add(basTraycode);
-        }
         basTraycodeFormat.setUpdateTime(DateUtils.getNowDate());
-        //插入条码信息
-        basTraycodeService.insertBasTraycodeList(traycodeList);
         return basTraycodeFormatMapper.updateBasTraycodeFormat(basTraycodeFormat);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java

@@ -182,8 +182,8 @@ public class CheckStockinServiceImpl implements ICheckStockinService {
                 CheckStockinDetail checkStockinDetail = detailList.get(i);
                 checkStockinDetail.setStockCheckDetailId(stockCheckId + "-" + (i + 1));
                 checkStockinDetail.setStockCheckId(stockCheckId);
-                BasProduct basProduct = productService.selectBasProductByProductId(checkStockinDetail.getProductId());
-                checkStockinDetail.setProductGuid(basProduct.getProductGuid());
+//                BasProduct basProduct = productService.selectBasProductByProductId(checkStockinDetail.getProductId());
+//                checkStockinDetail.setProductGuid(basProduct.getProductGuid());
                 checkStockinDetail.setStockCheckGuid(checkStockin.getStockGuid());
                 checkStockinDetail.setScanNum("0");
                 checkStockinDetail.setAssignNum("0");
@@ -229,7 +229,7 @@ public class CheckStockinServiceImpl implements ICheckStockinService {
             checkStockinMapper.autoAllot(map);
             builder.append("行明细：" + checkStockinDetail.getStockCheckDetailId() + "，分配结果：" + map.get("v_resultmsg") + "<br />");
         }
-        iToWcsService.pushOutMydoJob();
+        //iToWcsService.pushOutMydoJob();
 
         return AjaxResult.success(builder.toString());
 

ruoyi-admin/src/main/java/com/ruoyi/device/agv/mapper/AgvContainerTaskMapper.java

@@ -60,4 +60,6 @@ public interface AgvContainerTaskMapper
     public int deleteAgvContainerTaskByIds(Long[] ids);
 
     void insertHistory(Long id);
+
+    void deleteAgvJobByOrder(String order);
 }

ruoyi-admin/src/main/java/com/ruoyi/device/agv/service/IAgvContainerTaskService.java

@@ -60,4 +60,6 @@ public interface IAgvContainerTaskService
     public int deleteAgvContainerTaskById(Long id);
 
     void insertHistory(Long id);
+
+    void deleteAgvJobByOrder(String order);
 }

ruoyi-admin/src/main/java/com/ruoyi/device/agv/service/impl/AgvContainerTaskServiceImpl.java

@@ -97,4 +97,9 @@ public class AgvContainerTaskServiceImpl implements IAgvContainerTaskService
     public void insertHistory(Long id) {
         agvContainerTaskMapper.insertHistory(id);
     }
+
+    @Override
+    public void deleteAgvJobByOrder(String order) {
+        agvContainerTaskMapper.deleteAgvJobByOrder(order);
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/InStockin.java

@@ -102,8 +102,54 @@ public class InStockin extends BaseEntity
 
     private String lotNo;
     private String materialDesc;
+    private String productId;
     private String startDate;
 
+    private String companyShortName;
+    private String accountSetNo;
+    private String cargoNo;
+    private String stockinDetailId;
+
+    public String getProductId() {
+        return productId;
+    }
+
+    public void setProductId(String productId) {
+        this.productId = productId;
+    }
+
+    public String getStockinDetailId() {
+        return stockinDetailId;
+    }
+
+    public void setStockinDetailId(String stockinDetailId) {
+        this.stockinDetailId = stockinDetailId;
+    }
+
+    public String getCargoNo() {
+        return cargoNo;
+    }
+
+    public void setCargoNo(String cargoNo) {
+        this.cargoNo = cargoNo;
+    }
+
+    public String getCompanyShortName() {
+        return companyShortName;
+    }
+
+    public void setCompanyShortName(String companyShortName) {
+        this.companyShortName = companyShortName;
+    }
+
+    public String getAccountSetNo() {
+        return accountSetNo;
+    }
+
+    public void setAccountSetNo(String accountSetNo) {
+        this.accountSetNo = accountSetNo;
+    }
+
     private List<String> typeData;
 
     public String getStartDate() {

ruoyi-admin/src/main/java/com/ruoyi/in/stockin/mapper/InStockinMapper.java

@@ -66,4 +66,6 @@ public interface InStockinMapper
     void insertInStockinHistory(InStockin inStockin);
 
     List<InStockin> selectStockinByDetail(String stockinDetailId);
+
+    List<InStockin> selectInStockinListBill(InStockin param);
 }

ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/IInStockinService.java

@@ -73,4 +73,6 @@ public interface IInStockinService
     public int deleteInStockinByStockinGuid(String stockinGuid);
 
     public List<InStockin> selectStockinByDetail(String stockinDetailId);
+
+    List<InStockin> selectInStockinListBill(InStockin param);
 }

ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java

@@ -255,4 +255,9 @@ public class InStockinServiceImpl implements IInStockinService
     public List<InStockin> selectStockinByDetail(String stockinDetailId) {
         return inStockinMapper.selectStockinByDetail(stockinDetailId);
     }
+
+    @Override
+    public List<InStockin> selectInStockinListBill(InStockin param) {
+        return inStockinMapper.selectInStockinListBill(param);
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/in/stockinback/domain/InStockinBack.java

@@ -95,6 +95,24 @@ public class InStockinBack extends BaseEntity
     private String sendTime;
 
     private String msg;
+    private String companyShortName;
+    private String accountSetNo;
+
+    public String getCompanyShortName() {
+        return companyShortName;
+    }
+
+    public void setCompanyShortName(String companyShortName) {
+        this.companyShortName = companyShortName;
+    }
+
+    public String getAccountSetNo() {
+        return accountSetNo;
+    }
+
+    public void setAccountSetNo(String accountSetNo) {
+        this.accountSetNo = accountSetNo;
+    }
 
     public String getSendStatus() {
         return sendStatus;

ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/domain/InStockinDetailBack.java

@@ -152,6 +152,44 @@ public class InStockinDetailBack extends BaseEntity
 
     private String msg;
 
+
+    private String sourceLineId;
+    private String barCode;
+    private String isBatchManage;
+    private String oldProjectNo;
+
+    public String getSourceLineId() {
+        return sourceLineId;
+    }
+
+    public void setSourceLineId(String sourceLineId) {
+        this.sourceLineId = sourceLineId;
+    }
+
+    public String getBarCode() {
+        return barCode;
+    }
+
+    public void setBarCode(String barCode) {
+        this.barCode = barCode;
+    }
+
+    public String getIsBatchManage() {
+        return isBatchManage;
+    }
+
+    public void setIsBatchManage(String isBatchManage) {
+        this.isBatchManage = isBatchManage;
+    }
+
+    public String getOldProjectNo() {
+        return oldProjectNo;
+    }
+
+    public void setOldProjectNo(String oldProjectNo) {
+        this.oldProjectNo = oldProjectNo;
+    }
+
     public String getSendStatus() {
         return sendStatus;
     }

ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/mapper/InStockinDetailBackMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.ruoyi.in.stockin.domain.InStockin;
 import com.ruoyi.in.stockindeatilback.domain.InStockinDetailBack;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 入库单据子信息Mapper接口
@@ -61,4 +62,8 @@ public interface InStockinDetailBackMapper
      * @return 结果
      */
     public int deleteInStockinDetailBackByStockinDetailIds(String[] stockinDetailIds);
+
+    void insertInStockInDetailBackFinish(@Param("list") List<InStockinDetailBack> inStockinDetailParam);
+
+    void deleteInStockInDetailList(@Param("idList") List<InStockinDetailBack> inStockinDetails);
 }

ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/service/IInStockinDetailBackService.java

@@ -58,4 +58,8 @@ public interface IInStockinDetailBackService
      * @return 结果
      */
     public int deleteInStockinDetailBackByStockinDetailId(String stockinDetailId);
+
+    void insertInStockInDetailBackFinish(List<InStockinDetailBack> inStockinDetails);
+
+    void deleteInStockInDetailList(List<InStockinDetailBack> inStockinDetails);
 }

ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/service/impl/InStockinDetailBackServiceImpl.java

@@ -90,4 +90,14 @@ public class InStockinDetailBackServiceImpl implements IInStockinDetailBackServi
     {
         return inStockinDetailBackMapper.deleteInStockinDetailBackByStockinDetailId(stockinDetailId);
     }
+
+    @Override
+    public void insertInStockInDetailBackFinish(List<InStockinDetailBack> inStockinDetails) {
+         inStockinDetailBackMapper.insertInStockInDetailBackFinish(inStockinDetails);
+    }
+
+    @Override
+    public void deleteInStockInDetailList(List<InStockinDetailBack> inStockinDetails) {
+        inStockinDetailBackMapper.deleteInStockInDetailList(inStockinDetails);
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java

@@ -143,9 +143,13 @@ public class InStockinDetail extends BaseEntity
     private String status;
 
     private ExtraField extraField;
+    private String erpBill;
 
     private String warehouseName;
 
     private String warehouseId;
-
+    private String sourceLineId;
+    private String barCode;
+    private String isBatchManage;
+    private String oldProjectNo;
 }

ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/mapper/InStockinDetailMapper.java

@@ -69,4 +69,6 @@ public interface InStockinDetailMapper
     void deleteInStockinDetailByStockinGuid(String stockinGuid);
 
     InStockinDetail selectStockinByDetailById(InStockinDetail inStockinDetail);
+
+    List<InStockinDetail> selectStockInByDetailByBarCode(String barCode);
 }

ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/IInStockinDetailService.java

@@ -81,4 +81,6 @@ public interface IInStockinDetailService
 
 
     public InStockinDetail selectStockinByDetailById(InStockinDetail inStockinDetail);
+
+    List<InStockinDetail> selectStockInByDetailByBarCode(String barCode);
 }

ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java

@@ -127,4 +127,9 @@ public class InStockinDetailServiceImpl implements IInStockinDetailService
         return   inStockinDetailMapper.selectStockinByDetailById(inStockinDetail);
 
     }
+
+    @Override
+    public List<InStockinDetail> selectStockInByDetailByBarCode(String barCode) {
+        return   inStockinDetailMapper.selectStockInByDetailByBarCode(barCode);
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/domain/InStockinFinish.java

@@ -89,6 +89,15 @@ public class InStockinFinish extends BaseEntity
     /** 备用字段5 */
     @Excel(name = "备用字段5")
     private String spare5;
+    private String stockinDetailId;
+
+    public String getStockinDetailId() {
+        return stockinDetailId;
+    }
+
+    public void setStockinDetailId(String stockinDetailId) {
+        this.stockinDetailId = stockinDetailId;
+    }
 
     public void setStockinGuid(String stockinGuid)
     {

ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/impl/InStockinFinishServiceImpl.java

@@ -102,7 +102,7 @@ public class InStockinFinishServiceImpl implements IInStockinFinishService
     }
 
     @Override
-    @DataScope(warehouseAlias = "is2")
+//    @DataScope(warehouseAlias = "is2")
     public List<InStockin> selectInStockinFinishListByInStockin(InStockin inStockin) {
         return inStockinFinishMapper.selectInStockinFinishListByInStockin(inStockin);
     }

ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java

@@ -124,6 +124,9 @@ public class MydoJob extends BaseEntity
     /** 重分标记 */
     @Excel(name = "重分标记")
     private String faultFlag;
+    private String endPoint;
+
+
 
     private String inOut;
 
@@ -133,6 +136,23 @@ public class MydoJob extends BaseEntity
     private String createRightTime;
 
     private String productId;
+    private String stockinDetailId;
+
+    public String getEndPoint() {
+        return endPoint;
+    }
+
+    public void setEndPoint(String endPoint) {
+        this.endPoint = endPoint;
+    }
+
+    public String getStockinDetailId() {
+        return stockinDetailId;
+    }
+
+    public void setStockinDetailId(String stockinDetailId) {
+        this.stockinDetailId = stockinDetailId;
+    }
 
     public String getProductId() {
         return productId;

ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/mapper/MydoJobMapper.java

@@ -82,5 +82,14 @@ public interface MydoJobMapper
 
     MydoJob selectInJobByTrayCode(@Param("trayCode") String trayCode);
 
+    MydoJob selectInJobByTaskNo(@Param("taskNo") String taskNo);
+
+
     void allotInJobSpace(HashMap<String, Object> map);
+
+    void ykCompleted(HashMap<String, Object> map);
+
+    void updateLed(HashMap<String, Object> map);
+
+    void updateLedError(HashMap<String, Object> map);
 }

ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java

@@ -109,4 +109,6 @@ public interface IMydoJobService
     MydoJob selectMydoJobByEntranceId(MydoJob mydoJob);
 
     List<MydoJob> getInJobBySerial(String serial);
+
+    void ykCompleted(MydoJob outJob);
 }

ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java

@@ -192,7 +192,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
             List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectMydoJobDetailList(param);
 
             for (MydoJobDetail mydoJobDetail : mydoJobDetails) {
-                String inOrOutDId = mydoJobDetail.getInOrOutDId();
+                String inOrOutDId = mydoJobDetail.getStockinDetailId();
                 InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByStockinDetailId(inOrOutDId);
                 BigDecimal stockInNum = Convert.toBigDecimal(inStockinDetail.getScanNum());
                 BigDecimal jobInNum = Convert.toBigDecimal(mydoJobDetail.getInQuantity());
@@ -506,7 +506,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
             msg = map.get("v_resultmsg").toString();
             builder.append("托盘：" + basStock.getTrayCode() + "，分配结果：" + msg + "<br/>");
         }
-        iToWcsService.pushOutMydoJob();
+        //iToWcsService.pushOutMydoJob();
         if (!StrUtil.isEmpty(builder)) {
             return AjaxResult.warn(builder.toString());
         }
@@ -527,4 +527,17 @@ public class MydoJobServiceImpl implements IMydoJobService {
     public List<MydoJob> getInJobBySerial(String trayCode) {
         return mydoJobMapper.getInJobBySerial(trayCode);
     }
+
+    @Override
+    public void ykCompleted(MydoJob outJob) {
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("v_job_id", outJob.getJobId());
+        map.put("v_result", null);
+        mydoJobMapper.ykCompleted(map);
+        if (!"10".equals(map.get("v_result").toString())) {
+            log.error("移库任务处理异常 异常代码{}", map.get("v_result"));
+        }else{
+            log.info("移库任务处理成功 jobId:[{}] trayCode:[{}]", outJob.getJobId(), outJob.getTrayCode());
+        }
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/PkDetail.java

@@ -0,0 +1,27 @@
+package com.ruoyi.job.mydojobdetail.domain;
+
+import java.io.Serializable;
+
+public class PkDetail implements Serializable {
+    private String stockinDetailId;
+    private String quantity;
+
+
+    public String getStockinDetailId() {
+        return stockinDetailId;
+    }
+
+    public void setStockinDetailId(String stockinDetailId) {
+        this.stockinDetailId = stockinDetailId;
+    }
+
+    public String getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(String quantity) {
+        this.quantity = quantity;
+    }
+
+
+}

ruoyi-admin/src/main/java/com/ruoyi/log/controller/RequestLogController.java

@@ -85,6 +85,34 @@ public class RequestLogController extends BaseController
         return toAjax(requestLogService.updateRequestLog(requestLog));
     }
 
+
+
+
+
+    @GetMapping("/getMethod")
+    public AjaxResult getMethod()
+    {
+        List<String> strings=requestLogService.getMethod();
+        return AjaxResult.success(requestLogService.getMethod());
+    }
+
+    // 获取原系统
+    @GetMapping("/getSource")
+    public AjaxResult getSource()
+    {
+        List<String> strings=requestLogService.getSource();
+        return AjaxResult.success(requestLogService.getSource());
+    }
+    // 获取目标系统
+    @GetMapping("/getTarget")
+    public AjaxResult getTarget()
+    {
+        List<String> strings=requestLogService.getTarget();
+        return AjaxResult.success(requestLogService.getTarget());
+    }
+
+
+
     /**
      * 删除接口记录
      */

ruoyi-admin/src/main/java/com/ruoyi/log/mapper/RequestLogMapper.java

@@ -59,4 +59,10 @@ public interface RequestLogMapper
      * @return 结果
      */
     public int deleteRequestLogByRequestIds(Long[] requestIds);
+
+    List<String> getMethod();
+
+    List<String> getSource();
+
+    List<String> getTarget();
 }

ruoyi-admin/src/main/java/com/ruoyi/log/service/IRequestLogService.java

@@ -69,6 +69,7 @@ public interface IRequestLogService
      * @return
      */
     public RequestLog getRequestLog(String url, String param, String remark,String source,String target);
+    public RequestLog getRequestLog(String url, String param, String remark,String source,String target,String billType,String ciccid);
     /**
      * 接收接口记录
      *
@@ -77,4 +78,12 @@ public interface IRequestLogService
      * @return
      */
     public RequestLog getRequestLog(String param, String remark, AjaxResult ajaxResult);
+
+    public RequestLog getRequestLogERP(String param, String remark, AjaxResult ajaxResult);
+
+    List<String> getMethod();
+
+    List<String> getSource();
+
+    List<String> getTarget();
 }

ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java

@@ -3,6 +3,8 @@ package com.ruoyi.log.service.impl;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.net.URLEncodeUtil;
+import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONUtil;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -122,8 +124,10 @@ public class RequestLogServiceImpl implements IRequestLogService
         requestLog.setRequestBody(param);
         requestLog.setRequestUrl(url);
         try {
-            String resStr = HttpUtil.post(url, param);
+//            String resStr = HttpRequest.post(url).contentType("application/x-www-from-urlencoded").timeout(2000).body(param).execute().body();
 
+            String resStr =  HttpUtil.post(url, param);
+            requestLog.setResponseBody(resStr);
             // 判断resStr的状态码，如果不是200抛出异常让catch捕获
             if (!JSONUtil.isJsonObj(resStr)) {
                 throw new RuntimeException("返回结果不是有效的JSON对象");
@@ -133,7 +137,6 @@ public class RequestLogServiceImpl implements IRequestLogService
             if (codeObj == null || !codeObj.toString().equals("200")) {
                 throw new RuntimeException("请求失败，状态码: " + (codeObj != null ? codeObj.toString() : "null"));
             }
-            requestLog.setResponseBody(resStr);
             requestLog.setResponseTime(DateUtil.formatDateTime(new Date()));
             requestLog.setResponseStatus("1");
             requestLog.setDuration(Convert.toStr(DateUtil.between(Convert.toDate(requestLog.getRequestTime()), Convert.toDate(requestLog.getResponseTime()), DateUnit.MS)));
@@ -148,6 +151,53 @@ public class RequestLogServiceImpl implements IRequestLogService
         return requestLog;
     }
 
+    @Override
+    public RequestLog getRequestLog(String url, String param, String remark, String source, String target, String billType, String ciccid) {
+        String body = "datajson=" + param
+                + "&ibilltype=" + URLEncodeUtil.encodeAll(billType)
+                + "&cacc_id=" + URLEncodeUtil.encodeAll(ciccid);
+
+        RequestLog requestLog = new RequestLog();
+        requestLog.setRequestTime(DateUtil.formatDateTime(new Date()));
+        requestLog.setSourceSystem(source);
+        requestLog.setTargetSystem(target);
+        requestLog.setEndpoint(remark);
+        requestLog.setRequestMethod("post");
+        requestLog.setRequestHeaders(null);
+        requestLog.setRequestBody(body);
+        requestLog.setRequestUrl(url);
+        try {
+            String resStr = HttpRequest.post(url)
+                    .contentType("application/x-www-form-urlencoded;charset=UTF-8")
+                    .body(body)
+                    .execute().body();
+
+            requestLog.setResponseBody(resStr);
+            // 判断resStr的状态码，如果不是200抛出异常让catch捕获
+            if (!JSONUtil.isJsonObj(resStr)) {
+                throw new RuntimeException("返回结果不是有效的JSON对象");
+            }
+            cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(resStr);
+            Object codeObj = jsonObject.get("ErrCode");
+            if (codeObj == null || !codeObj.toString().equals("0")) {
+                throw new RuntimeException("请求失败，状态码: " + (codeObj != null ? codeObj.toString() : "null"));
+            }
+            requestLog.setResponseTime(DateUtil.formatDateTime(new Date()));
+            requestLog.setResponseStatus("1");
+            requestLog.setDuration(Convert.toStr(DateUtil.between(Convert.toDate(requestLog.getRequestTime()), Convert.toDate(requestLog.getResponseTime()), DateUnit.MS)));
+            requestLog.setIsSuccessful("1");
+        } catch (Exception e) {
+            requestLog.setErrorDetails(e.getMessage());
+            requestLog.setIsSuccessful("0");
+            requestLog.setResponseStatus("0");
+        } finally {
+            insertRequestLog(requestLog);
+        }
+        return requestLog;
+    }
+
+
+
     /**
      * 插入请求日志
      *
@@ -173,4 +223,46 @@ public class RequestLogServiceImpl implements IRequestLogService
         requestLog.setResponseBody(Convert.toStr(ajaxResult.get("msg")));
         return requestLog;
     }
+
+    @Override
+    public RequestLog getRequestLogERP(String param, String remark, AjaxResult ajaxResult) {
+        RequestLog requestLog = new RequestLog();
+        requestLog.setRequestTime(DateUtil.formatDateTime(new Date()));
+        requestLog.setRequestBody(param);
+        requestLog.setSourceSystem("erp");
+        requestLog.setTargetSystem("wms");
+        requestLog.setEndpoint(remark);
+        requestLog.setRequestMethod("post");
+        requestLog.setResponseTime(DateUtil.formatDateTime(new Date()));
+        requestLog.setDuration(Convert.toStr(DateUtil.between(Convert.toDate(requestLog.getRequestTime()), Convert.toDate(requestLog.getResponseTime()), DateUnit.MS)));
+        requestLog.setResponseStatus("1");
+        if (ajaxResult.isSuccess()){
+            requestLog.setIsSuccessful("1");
+        }else {
+            requestLog.setIsSuccessful("0");
+        }
+        requestLog.setResponseBody(Convert.toStr(ajaxResult.get("msg")));
+        return requestLog;
+    }
+
+    @Override
+    public List<String> getMethod() {
+
+        return requestLogMapper.getMethod();
+    }
+
+    @Override
+    public List<String> getSource() {
+        return requestLogMapper.getSource();
+    }
+
+    @Override
+    public List<String> getTarget() {
+        return requestLogMapper.getTarget();
+    }
+
+    public static void main(String[] args) {
+        String aa = "{\"code\":\"200,\"success\":true,\"msg\":\"请求成功\"}";
+        System.out.println(JSONUtil.isJsonObj(aa));
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/controller/ViewHandAllotStockController.java

@@ -42,6 +42,9 @@ public class ViewHandAllotStockController extends BaseController
     public TableDataInfo list(ViewHandAllotStock viewHandAllotStock)
     {
         startPage();
+        if (viewHandAllotStock.getWarehouseCode()==null||viewHandAllotStock.getWarehouseCode().equals("")){
+            viewHandAllotStock.setWarehouseCode("1");
+        }
         List<ViewHandAllotStock> list = viewHandAllotStockService.selectViewHandAllotStockList(viewHandAllotStock);
         return getDataTable(list);
     }

ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/domain/ViewHandAllotStock.java

@@ -4,6 +4,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.springframework.data.annotation.Transient;
 
 /**
  * 手动分配库存对象 view_hand_allot_stock
@@ -187,7 +188,38 @@ public class ViewHandAllotStock extends BaseEntity
     @Excel(name = "货位锁")
     private String locked;
 
-    public void setStockId(String stockId) 
+    @Transient
+    private String ktpType;
+    @Transient
+    private String productType;
+    @Transient
+    private String warehouseCode;
+
+    public String getWarehouseCode() {
+        return warehouseCode;
+    }
+
+    public void setWarehouseCode(String warehouseCode) {
+        this.warehouseCode = warehouseCode;
+    }
+
+    public String getKtpType() {
+        return ktpType;
+    }
+
+    public void setKtpType(String ktpType) {
+        this.ktpType = ktpType;
+    }
+
+    public String getProductType() {
+        return productType;
+    }
+
+    public void setProductType(String productType) {
+        this.productType = productType;
+    }
+
+    public void setStockId(String stockId)
     {
         this.stockId = stockId;
     }

ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java

@@ -35,7 +35,7 @@ public class OutStockoutController extends BaseController {
     /**
      * 查询出库主单列表
      */
-    @PreAuthorize("@ss.hasPermi('out:outStockout:list')")
+//    @PreAuthorize("@ss.hasPermi('out:outStockout:list')")
     @GetMapping("/list")
     public TableDataInfo list(OutStockout outStockout) {
         startPage();
@@ -51,7 +51,7 @@ public class OutStockoutController extends BaseController {
     /**
      * 导出出库主单列表
      */
-    @PreAuthorize("@ss.hasPermi('out:outStockout:export')")
+//    @PreAuthorize("@ss.hasPermi('out:outStockout:export')")
     @Log(title = "出库主单", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, OutStockout outStockout) {
@@ -63,7 +63,7 @@ public class OutStockoutController extends BaseController {
     /**
      * 获取出库主单详细信息
      */
-    @PreAuthorize("@ss.hasPermi('out:outStockout:query')")
+//    @PreAuthorize("@ss.hasPermi('out:outStockout:query')")
     @GetMapping(value = "/{stockoutGuid}")
     public AjaxResult getInfo(@PathVariable("stockoutGuid") String stockoutGuid) {
         return success(outStockoutService.selectOutStockoutByStockoutGuid(stockoutGuid));
@@ -72,7 +72,7 @@ public class OutStockoutController extends BaseController {
     /**
      * 新增出库主单
      */
-    @PreAuthorize("@ss.hasPermi('out:outStockout:add')")
+//    @PreAuthorize("@ss.hasPermi('out:outStockout:add')")
     @Log(title = "出库主单", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody OutStockout outStockout) {
@@ -82,7 +82,7 @@ public class OutStockoutController extends BaseController {
     /**
      * 修改出库主单
      */
-    @PreAuthorize("@ss.hasPermi('out:outStockout:edit')")
+//    @PreAuthorize("@ss.hasPermi('out:outStockout:edit')")
     @Log(title = "出库主单", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody OutStockout outStockout) {
@@ -92,7 +92,7 @@ public class OutStockoutController extends BaseController {
     /**
      * 删除出库主单
      */
-    @PreAuthorize("@ss.hasPermi('out:outStockout:remove')")
+//    @PreAuthorize("@ss.hasPermi('out:outStockout:remove')")
     @Log(title = "出库主单", businessType = BusinessType.DELETE)
     @DeleteMapping("/{stockoutGuids}")
     public AjaxResult remove(@PathVariable String[] stockoutGuids) {
@@ -107,7 +107,7 @@ public class OutStockoutController extends BaseController {
      */
     @Log(title = "出库主单保存", businessType = BusinessType.OTHER)
     @PostMapping("/saveBill")
-    @PreAuthorize("@ss.hasPermi('out:outStockout:saveBill')")
+//    @PreAuthorize("@ss.hasPermi('out:outStockout:saveBill')")
     @ResponseBody
     public AjaxResult saveBill(@RequestBody OutStockoutVo outStockoutVo) {
         String stockOutId = outStockoutService.saveBill(outStockoutVo);
@@ -117,7 +117,7 @@ public class OutStockoutController extends BaseController {
     /**
      * 出库单据状态改变
      */
-    @PreAuthorize("@ss.hasPermi('out:outStockout:changeStatus')")
+//    @PreAuthorize("@ss.hasPermi('out:outStockout:changeStatus')")
     @Log(title = "出库主单状态改变", businessType = BusinessType.OTHER)
     @RequestMapping("/changeStatus")
     @ResponseBody
@@ -132,17 +132,24 @@ public class OutStockoutController extends BaseController {
      * @param stockoutId
      * @return
      */
-    @PreAuthorize("@ss.hasPermi('out:outStockout:autoAllot')")
+//    @PreAuthorize("@ss.hasPermi('out:outStockout:autoAllot')")
     @Log(title = "出库单自动分配", businessType = BusinessType.OTHER)
     @GetMapping("/autoAllot")
     public AjaxResult autoAllot(@RequestParam("stockoutId") String stockoutId) {
+        // 修改出库方向
+//        OutStockout outStockout = new OutStockout();
+//        outStockout.setStockoutId(stockoutId);
+//        outStockout.setSpare8(spare8);
+//        outStockoutService.updateOutStockout(outStockout);
+        System.out.println(stockoutId);
+//        System.out.println(spare8);
         return outStockoutService.autoAllot(stockoutId);
     }
 
     /**
      * 手动分配
      */
-    @PreAuthorize("@ss.hasPermi('out:outStockout:manualAllot')")
+//    @PreAuthorize("@ss.hasPermi('out:outStockout:manualAllot')")
     @Log(title = "出库单手动分配", businessType = BusinessType.OTHER)
     @GetMapping("/manualAllot")
     public AjaxResult manualAllot(@RequestParam("stockList") String[] stockList, @RequestParam("stockoutDetailId") String stockoutDetailId) {

ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java

@@ -91,6 +91,9 @@ public class OutStockout extends BaseEntity
     private String spare4;
 
     private String spare5;
+    private String spare6;
+    private String spare7;
+    private String spare8;
 
     private String customerName;
 
@@ -99,9 +102,51 @@ public class OutStockout extends BaseEntity
     private String productId;
 
     private String productName;
+    private String companyShortName;
+    private String accountSetNo;
+
+    public String getCompanyShortName() {
+        return companyShortName;
+    }
+
+    public void setCompanyShortName(String companyShortName) {
+        this.companyShortName = companyShortName;
+    }
+
+    public String getAccountSetNo() {
+        return accountSetNo;
+    }
+
+    public void setAccountSetNo(String accountSetNo) {
+        this.accountSetNo = accountSetNo;
+    }
 
     private List<String> typeData;
 
+    public String getSpare6() {
+        return spare6;
+    }
+
+    public void setSpare6(String spare6) {
+        this.spare6 = spare6;
+    }
+
+    public String getSpare7() {
+        return spare7;
+    }
+
+    public void setSpare7(String spare7) {
+        this.spare7 = spare7;
+    }
+
+    public String getSpare8() {
+        return spare8;
+    }
+
+    public void setSpare8(String spare8) {
+        this.spare8 = spare8;
+    }
+
     public List<String> getTypeData() {
         return typeData;
     }

ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/mapper/OutStockoutMapper.java

@@ -68,4 +68,6 @@ public interface OutStockoutMapper
     OutStockout selectOutStockoutByStockoutId(String stockoutId);
 
     void manualAllot(HashMap<String, String> map);
+
+    void updateOutStockouts(OutStockout mainOut);
 }

ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/IOutStockoutService.java

@@ -73,4 +73,6 @@ public interface IOutStockoutService
     List<OutStockout> selectOutStockoutListApi(OutStockout outStockoutParam);
 
     AjaxResult manualAllot(String[] stockList,String stockoutDetailId);
+
+    void updateOutStockouts(OutStockout mainOut);
 }

ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java

@@ -180,10 +180,11 @@ public class OutStockoutServiceImpl implements IOutStockoutService
         for (OutStockoutDetail detail : outStockoutDetails) {
             if (detail.getAllotQuantity().compareTo(detail.getQuantity()) < 0){
                 map.put("v_stockout_detail_id",  detail.getStockoutDetailId());
+                map.put("v_result", null);
+                map.put("v_resultmsg", null);
                 outStockoutMapper.autoAllot(map);
-                toWcsService.pushOutMydoJob();
                 if (!"10".equals(map.get("v_result"))){
-                    stringBuilder.append(",").append(detail.getStockoutDetailId()+map.get("v_resultString"));
+                    stringBuilder.append(",").append(detail.getStockoutDetailId()+map.get("v_resultmsg"));
                 }
             }else{
                 stringBuilder.append(",").append(detail.getStockoutDetailId()+"单据已分配完成");
@@ -209,7 +210,7 @@ public class OutStockoutServiceImpl implements IOutStockoutService
             map.put("v_stockout_detail_id", stockoutDetailId);
             map.put("v_stock_id", stock);
             outStockoutMapper.manualAllot(map);
-            toWcsService.pushOutMydoJob();
+            //toWcsService.pushOutMydoJob();
             if (!"10".equals(map.get("v_result"))){
                 stringBuilder.append(",").append(stockoutDetailId+map.get("v_resultString"));
             }
@@ -219,4 +220,9 @@ public class OutStockoutServiceImpl implements IOutStockoutService
         }
         return AjaxResult.success();
     }
+
+    @Override
+    public void updateOutStockouts(OutStockout mainOut) {
+       outStockoutMapper.updateOutStockouts(mainOut);
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java

@@ -48,7 +48,7 @@ public class OutStockoutDetail extends BaseEntity
 
     /** 计划数量（箱） */
     @Excel(name = "计划数量", readConverterExp = "箱=")
-    private BigDecimal quantityX;
+    private String quantityX;
 
     /** 计划数量（件） */
     @Excel(name = "计划数量", readConverterExp = "件=")
@@ -200,6 +200,42 @@ public class OutStockoutDetail extends BaseEntity
 
     private String spare9;
 
+    private String sourceLineId;
+    private String barCode;
+    private String isBatchManage;
+    private String oldProjectNo;
+
+    public String getSourceLineId() {
+        return sourceLineId;
+    }
+
+    public void setSourceLineId(String sourceLineId) {
+        this.sourceLineId = sourceLineId;
+    }
+
+    public String getBarCode() {
+        return barCode;
+    }
+
+    public void setBarCode(String barCode) {
+        this.barCode = barCode;
+    }
+
+    public String getIsBatchManage() {
+        return isBatchManage;
+    }
+
+    public void setIsBatchManage(String isBatchManage) {
+        this.isBatchManage = isBatchManage;
+    }
+
+    public String getOldProjectNo() {
+        return oldProjectNo;
+    }
+
+    public void setOldProjectNo(String oldProjectNo) {
+        this.oldProjectNo = oldProjectNo;
+    }
 
     public String getSpare1() {
         return spare1;
@@ -407,14 +443,12 @@ public class OutStockoutDetail extends BaseEntity
         return quantity;
     }
 
-    public void setQuantityX(BigDecimal quantityX)
-    {
-        this.quantityX = quantityX;
+    public String getQuantityX() {
+        return quantityX;
     }
 
-    public BigDecimal getQuantityX()
-    {
-        return quantityX;
+    public void setQuantityX(String quantityX) {
+        this.quantityX = quantityX;
     }
 
     public void setQuantityJ(BigDecimal quantityJ)

ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/controller/ViewProductAndStockController.java

@@ -35,7 +35,7 @@ public class ViewProductAndStockController extends BaseController
     private IViewProductAndStockService viewProductAndStockService;
 
     /**
-     * 查询库存物资列表
+//     * 查询库存物资列表
      */
     @PreAuthorize("@ss.hasPermi('productAndStock:productAndStock:list')")
     @GetMapping("/list")

ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java

@@ -2,26 +2,42 @@ package com.ruoyi.pda.controller;
 
 import com.ruoyi.api.domain.RequestEnter;
 import com.ruoyi.api.domain.WcsPort;
+import com.ruoyi.bas.agvPoint.domain.AgvPoint;
+import com.ruoyi.bas.agvPoint.domain.AgvTask;
+import com.ruoyi.bas.agvPoint.service.impl.AgvPointServiceImpl;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.device.agv.domain.AgvContainerTask;
+import com.ruoyi.device.agv.service.IAgvContainerTaskService;
 import com.ruoyi.in.stockindetail.domain.InStockinDetail;
 import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
+import com.ruoyi.job.mydojob.domain.MydoJob;
+import com.ruoyi.job.mydojob.service.IMydoJobService;
+import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail;
+import com.ruoyi.out.outStockout.domain.OutStockout;
+import com.ruoyi.out.outStockout.service.impl.OutStockoutServiceImpl;
+import com.ruoyi.out.outStockoutDetail.domain.OutStockoutDetail;
+import com.ruoyi.out.outStockoutDetail.service.impl.OutStockoutDetailServiceImpl;
 import com.ruoyi.pda.domain.TrayCodeMakeSure;
 import com.ruoyi.pda.domain.TrayCodeMsg;
+import com.ruoyi.pda.mapper.PdaMapper;
 import com.ruoyi.pda.service.PdaService;
 import com.ruoyi.stock.stock.domain.BasStock;
+import com.ruoyi.stock.stock.service.IBasStockService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.UUID;
 
 @Controller
 @RequestMapping("/pda")
@@ -32,6 +48,20 @@ public class PdaController extends BaseController {
     private PdaService pdaService;
     @Autowired
     private IInStockinDetailService iInStockinDetailService;
+    @Autowired
+    private OutStockoutServiceImpl outStockoutService;
+    @Autowired
+    private OutStockoutDetailServiceImpl outStockoutDetailService;
+    @Autowired
+    private AgvPointServiceImpl agvPointService;
+    @Autowired
+    private IAgvContainerTaskService agvContainerTaskService;
+    @Autowired
+    private PdaMapper pdaMapper;
+    @Autowired
+    private IMydoJobService mydoJobService;
+    @Autowired
+    private IBasStockService basStockService;
 
     /**
      * 查询是否有半满托盘
@@ -46,11 +76,11 @@ public class PdaController extends BaseController {
     /**
      * 通过单据码查询物料详情
      */
-    @RequestMapping("/selectDetailById")
+    @RequestMapping("/selectDetailByIds")
     @ResponseBody
-    public AjaxResult selectDetailById(String inStockinDetailId) {
+    public AjaxResult selectDetailByIds(String inStockinDetailId) {
         InStockinDetail inStockinDetail = iInStockinDetailService.selectInStockinDetailByStockinDetailId(inStockinDetailId);
-        if(inStockinDetail != null) {
+        if (inStockinDetail != null) {
             inStockinDetail.setQuantity(String.valueOf(Integer.valueOf(inStockinDetail.getQuantity()) - Integer.valueOf(inStockinDetail.getScanNum())));
         }
         return AjaxResult.success(inStockinDetail);
@@ -67,6 +97,22 @@ public class PdaController extends BaseController {
     }
 
 
+    /**
+     * 通过单据码查询物料详情  TODO 修改单据码为barCode  前端需同步修改
+     */
+    @RequestMapping("/selectDetailById")
+    @ResponseBody
+    public AjaxResult selectDetailById(String barCode) {
+        List<InStockinDetail> stockinDetails = iInStockinDetailService.selectStockInByDetailByBarCode(barCode);
+        stockinDetails.stream().forEach(inStockinDetail -> {
+            Integer quantity = StringUtils.hasText(inStockinDetail.getQuantity()) ? Integer.valueOf(inStockinDetail.getQuantity()) : 0;
+            Integer scanNum = StringUtils.hasText(inStockinDetail.getScanNum()) ? Integer.valueOf(inStockinDetail.getScanNum()) : 0;
+            inStockinDetail.setQuantity(String.valueOf(quantity - scanNum));
+        });
+        return AjaxResult.success(stockinDetails);
+    }
+
+
     /**
      * 通过托盘码查询作业或trayMsg
      */
@@ -85,13 +131,20 @@ public class PdaController extends BaseController {
         return pdaService.bindTray(trayCodeMakeSure);
     }
 
+    @RequestMapping("/bindTray2")
+    @ResponseBody
+    public AjaxResult bindTray2(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
+        return pdaService.bindTray2(trayCodeMakeSure);
+    }
+
+
     /**
      * 空托盘入库
      */
     @RequestMapping("/tpIn")
     @ResponseBody
     public AjaxResult tpIn(@RequestBody TrayCodeMsg trayCodeMsg) {
-        return pdaService.tpIn(trayCodeMsg.getTrayCode());
+        return pdaService.tpIn(trayCodeMsg);
     }
 
     /**
@@ -105,12 +158,13 @@ public class PdaController extends BaseController {
 
     /**
      * 出库确认查询子作业信息
+     *
      * @param trayCodeMsg
      * @return
      */
     @RequestMapping("/selectJobDetailByTray")
     @ResponseBody
-    public AjaxResult selectJobDetailByTray(@RequestBody TrayCodeMsg trayCodeMsg){
+    public AjaxResult selectJobDetailByTray(@RequestBody TrayCodeMsg trayCodeMsg) {
         return pdaService.selectJobDetailByTray(trayCodeMsg);
     }
 
@@ -129,9 +183,6 @@ public class PdaController extends BaseController {
     }
 
 
-
-
-
     /**
      * 入库扫码生成作业
      */
@@ -142,7 +193,6 @@ public class PdaController extends BaseController {
     }
 
 
-
     @RequestMapping("/selectDetailByPDTray")
     @ResponseBody
     public AjaxResult selectDetailByPDTray(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
@@ -150,9 +200,6 @@ public class PdaController extends BaseController {
     }
 
 
-
-
-
     /**
      * 盘点出库确认
      *
@@ -161,7 +208,7 @@ public class PdaController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('pda:check:checkMakeSure')")
     @PostMapping("/checkMakeSure")
-    @Log(title = "手持机盘点出库确认", businessType = BusinessType.INSERT)
+    @Log(title = "手持机盘点出库确认", businessType = BusinessType.OTHER)
     @ResponseBody
     public AjaxResult checkMakeSure(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
         return pdaService.checkMakeSure(trayCodeMakeSure);
@@ -179,6 +226,245 @@ public class PdaController extends BaseController {
         return pdaService.updateWcsPort(wcsPort);
     }
 
+    @RequestMapping("/hcoutMakesure")
+    @ResponseBody
+    @Log(title = "手持机缓存出库确认", businessType = BusinessType.OTHER)
+    public AjaxResult hcoutMakesure(String trayCode) {
+
+        return pdaService.hcoutMakesure(trayCode);
+    }
+
+
+    /**
+     * 平库入库
+     */
+    @RequestMapping("/inStockPk")
+    @ResponseBody
+    public AjaxResult inStockPk(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
+        return pdaService.completeInPk(trayCodeMakeSure);
+    }
+
+    /**
+     * 库存查询(平库扫码查询托盘入库信息)
+     */
+    @RequestMapping("/searchStock")
+    @ResponseBody
+    public AjaxResult searchStock(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
+
+        return pdaService.selectBasStockHc(trayCodeMakeSure.getTrayCode());
+    }
+
+    /**
+     * 立库出库信息校验
+     *
+     * @param trayCodeMakeSure
+     * @return
+     */
+    @RequestMapping("/verifyMaterial")
+    @ResponseBody
+    public AjaxResult verifyMaterial(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
+        String trayCode = trayCodeMakeSure.getTrayCode();
+        List<MydoJobDetail> mydoJobDetailList = trayCodeMakeSure.getMydoJobDetailList();
+        for (MydoJobDetail m : mydoJobDetailList) {
+            Integer count = pdaService.selectByTrayCodeAndProduct(trayCode, m.getProductId());
+            if (count == 0) {
+                return AjaxResult.error(m.getProductId() + ",物料不是出库物料");
+            }
+        }
+
+        return AjaxResult.success();
+    }
+
+    /**
+     * 平库出库确认
+     *
+     * @param trayCodeMakeSure
+     * @return
+     */
+    @RequestMapping("/completeOutPk")
+    @ResponseBody
+    @Async
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult completeOutPk(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
+        try {
+            String trayCode = trayCodeMakeSure.getTrayCode();
+            List<MydoJobDetail> mydoJobDetailList = trayCodeMakeSure.getMydoJobDetailList();
+            for (MydoJobDetail m : mydoJobDetailList) {
+                HashMap<String, Object> map = new HashMap<>();
+                map.put("v_tray_code", trayCode);
+                map.put("v_out_stockout_detail_id", trayCodeMakeSure.getStockoutDetailId());
+                map.put("v_quantity", m.getOutQuantity());
+                map.put("v_stock_id", m.getStockId());
+                pdaService.completeOutPk(map);
+                Integer vResult = (Integer) map.get("v_result");
+                if (vResult != 10) {
+                    System.err.println(map.get("v_result_msg").toString());
+                    return AjaxResult.error(map.get("v_result_msg").toString());
+                }
+            }
+            return AjaxResult.success();
+        } catch (Exception e) {
+            throw new RuntimeException(e.getMessage());
+        }
+    }
+
+
+    /**
+     * 查询平库出库主单   建议参数（erpStockOutId U8单据号作为查询条件传到后台）
+     *
+     * @param outStockout
+     * @return
+     */
+    @RequestMapping("/OutFillPk")
+    @ResponseBody
+
+    public AjaxResult OutFillPk() {
+        OutStockout outStockout = new OutStockout();
+        outStockout.setWarehouseId("2");
+        outStockoutService.selectOutStockoutList(outStockout);
+        return AjaxResult.success(outStockoutService.selectOutStockoutList(outStockout));
+    }
+
+
+    /**
+     * 查出平库出库子单   参数： stockoutId 作为参数传递到后台
+     *
+     * @param outStockout
+     * @return
+     */
+    @RequestMapping("/OutFillPkDetail")
+    @ResponseBody
+    public AjaxResult OutFillPkDetail(@RequestBody OutStockout outStockout) {
+
+        List<OutStockout> outStockouts = outStockoutService.selectOutStockoutList(outStockout);
+
+        return AjaxResult.success(outStockoutDetailService.selectOutStockoutDetailByStockoutGuid(outStockouts.get(0).getStockoutGuid()));
+    }
+
+
+    /**
+     * 查询平库出库子单对应信息 在平库中是否存在
+     * 参数:trayCode      托盘码
+     * 参数：stockinDetailId 子单据号
+     *
+     * @param trayCodeMsg
+     * @return
+     */
+    @RequestMapping("/queryBasStockHc")
+    @ResponseBody
+    public AjaxResult queryBasStockHc(@RequestBody TrayCodeMsg trayCodeMsg) {
+        return pdaService.selectBasStockHcs(trayCodeMsg.getTrayCode(), trayCodeMsg.getStockoutDetailId());
+    }
+
+    // 立库扫码规则校验
+    @RequestMapping("/validateMaterial")
+    @ResponseBody
+    public AjaxResult validateMaterial(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("v_tray_code", trayCodeMakeSure.getTrayCode());
+        map.put("v_stockin_detail_id", trayCodeMakeSure.getInStockinDetailId());
+        map.put("v_is_bound_accord", trayCodeMakeSure.getIsBoundByAccord());
+        map.put("v_quantity", trayCodeMakeSure.getQuantity());
+        pdaMapper.bindTray(map);
+        if (!"10".equals(map.get("v_result").toString())) {
+            return AjaxResult.error(map.get("v_result").toString());
+        } else {
+            return AjaxResult.success(map.get("v_result").toString());
+        }
+    }
+
+
+    /**
+     * 平库出库信息校验
+     *
+     * @param trayCodeMakeSure TODO 要校验项目号，批号，以及其他条件，要复合查询，待修改
+     * @return
+     */
+    @RequestMapping("/verifypkTrayMaterials")
+    @ResponseBody
+    public AjaxResult verifypkTrayMaterials(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
+        String trayCode = trayCodeMakeSure.getTrayCode();
+        List<MydoJobDetail> mydoJobDetailList = trayCodeMakeSure.getMydoJobDetailList();
+        for (MydoJobDetail m : mydoJobDetailList) {
+            String productId = m.getProductId();
+            Integer integer = pdaService.selectBasStockHcCount(trayCode, productId);
+            if (integer == 0) {
+                return AjaxResult.error(m.getProductId() + ",物料不是出库物料");
+            }
+        }
+        return AjaxResult.success();
+    }
+
+
+    // 查询AGV的起点和终点
+    @RequestMapping("/selectAgvPointByType")
+    @ResponseBody
+    public AjaxResult selectAgvPointByType(String type) {
+        AgvPoint agvPoint = new AgvPoint();
+        agvPoint.setType(type);
+        List<AgvPoint> agvPoints = agvPointService.selectAgvPointList(agvPoint);
+        return AjaxResult.success(agvPoints);
+    }
+
+    // 保存agv执行队列
+    @RequestMapping("/insertAgvJob")
+    @ResponseBody
+    public AjaxResult insertAgvJob(@RequestBody AgvTask agvTask) {
+        AgvPoint agvPoint = new AgvPoint();
+        agvPoint.setStation(agvTask.getEndPoint());
+        List<AgvPoint> agvPoints = agvPointService.selectAgvPointList(agvPoint);
+        if (!agvPoints.get(0).getStation().equals("K1-1") && !agvPoints.get(0).getStation().equals("K2-1") && agvPoints.get(0).getSpare1().equals("2")) {
+            return AjaxResult.error("该点位被占用，请检查!");
+        }
+        AgvContainerTask agvContainerTask = new AgvContainerTask();
+        agvContainerTask.setContainer(UUID.randomUUID().toString());
+        agvContainerTask.setEndPoint(agvTask.getEndPoint());
+        agvContainerTask.setStartPoint(agvTask.getStartPoint());
+        agvContainerTask.setSpare1(agvTask.getType());
+        agvContainerTask.setSpare2(agvTask.getTrayCode());
+        agvContainerTask.setStatus("0");
+        agvContainerTaskService.insertAgvContainerTask(agvContainerTask);
+        return AjaxResult.success();
+    }
+
+
+    // 保存agv执行队列
+    @GetMapping("/selectAgvPointByType")
+    @ResponseBody
+    public AjaxResult selectAgvPointByType(String type, String position) {
+        System.out.println(type + "  " + position);
+        AgvPoint agvPoint = new AgvPoint();
+//        agvPoint.setType(type);
+        agvPoint.setStation(position);
+        List<AgvPoint> agvPoints = agvPointService.selectAgvPointList(agvPoint);
+
+
+        return AjaxResult.success(agvPoints);
+    }
+
+
+//    // 查询子单据的明细信息
+//    @RequestMapping("/selectDetailById")
+//    public AjaxResult selectDetailById(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
+//        String inStockinDetailId = trayCodeMakeSure.getInStockinDetailId();
+//        InStockinDetail inStockinDetail = iInStockinDetailService.selectInStockinDetailByStockinDetailId(inStockinDetailId);
+//        return AjaxResult.success(inStockinDetail);
+//
+//    }
+
+    @RequestMapping("/selectByTrayCode")
+    public AjaxResult selectByTrayCode(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
+        MydoJob mydoJob = mydoJobService.selectMydoJobByTrayCode(trayCodeMakeSure.getTrayCode());
+        if (mydoJob != null && mydoJob.getInOrOut().equals("26")) {
+            BasStock basStock = basStockService.selectBasStockListTopOne(trayCodeMakeSure.getTrayCode());
+            return AjaxResult.success(basStock);
+        } else {
+            return AjaxResult.error("该托盘无盘任务");
+        }
+
+
+    }
+
 
 }
 

ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMakeSure.java

@@ -1,6 +1,7 @@
 package com.ruoyi.pda.domain;
 
 import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail;
+import com.ruoyi.job.mydojobdetail.domain.PkDetail;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -22,10 +23,18 @@ public class TrayCodeMakeSure {
 
     private String exitId;
     private String isFull;
+    // 选中传1 没选中传0
+    private String isBoundByAccord;
     //拣选详情列表
     private List<MydoJobDetail> mydoJobDetailList;
     //盘点详情列表
     private List<MydoJobDetail> materials;
     //异常详情列表
     private List<MydoJobDetail> materialDetails;
+    private List<PkDetail> pkDetailList;
+    private String quantity;
+    private String stockinDetailId;
+    private String inStockinDetailId;
+    private String stockoutDetailId;
+    private String cargoSpaceId;
 }

ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMsg.java

@@ -1,5 +1,7 @@
 package com.ruoyi.pda.domain;
 
+import java.util.List;
+
 public class TrayCodeMsg {
 
 private String trayCode;
@@ -18,6 +20,26 @@ private String stockinDetailId;
 
 private String inOut;
 private String status;
+private String stockoutDetailId;
+
+
+    public String getStockoutDetailId() {
+        return stockoutDetailId;
+    }
+
+    public void setStockoutDetailId(String stockoutDetailId) {
+        this.stockoutDetailId = stockoutDetailId;
+    }
+
+    private String trayType;
+
+    public String getTrayType() {
+        return trayType;
+    }
+
+    public void setTrayType(String trayType) {
+        this.trayType = trayType;
+    }
 
     public String getStatus() {
         return status;

ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java

@@ -38,4 +38,18 @@ public interface PdaMapper {
     void pkOut(HashMap<String, Object> map);
 
     void outMakeSureException(HashMap<String, Object> map);
+
+    void hcoutMakesure(HashMap<String, Object> map);
+
+    Integer selectByTrayCodeAndProduct(String trayCode, String productId);
+
+    void completeOutPk(HashMap<String, Object> map);
+
+    void completeInPk(HashMap<String, Object> map);
+
+    void FillFinishAllot(HashMap<String, Object> map);
+
+    void FillFinishAllotOut(HashMap<String, Object> map);
+
+    void bindTrayCheck(HashMap<String, Object> map);
 }

ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java

@@ -8,6 +8,7 @@ import com.ruoyi.pda.domain.TrayCodeMakeSure;
 import com.ruoyi.pda.domain.TrayCodeMsg;
 import com.ruoyi.stock.stock.domain.BasStock;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -28,7 +29,7 @@ public interface PdaService {
 
    AjaxResult bindTray(TrayCodeMakeSure trayCodeMakeSure);
 
-   AjaxResult tpIn(String trayCode);
+   AjaxResult tpIn(TrayCodeMsg trayCodeMsg);
 
    AjaxResult tpOut(TrayCodeMsg trayCodeMsg);
 
@@ -56,4 +57,19 @@ public interface PdaService {
     AjaxResult updateWcsPort(WcsPort wcsport);
 
 
+    AjaxResult hcoutMakesure(String trayCode);
+
+    AjaxResult completeInPk(TrayCodeMakeSure trayCodeMakeSure);
+
+    AjaxResult selectBasStockHc(String trayCode);
+
+    Integer selectByTrayCodeAndProduct(String trayCode, String productId);
+
+    void completeOutPk(HashMap<String, Object> map);
+
+    Integer selectBasStockHcCount(String trayCode, String productId);
+
+    AjaxResult selectBasStockHcs(String trayCode, String stockoutDetailId);
+
+    AjaxResult bindTray2(TrayCodeMakeSure trayCodeMakeSure);
 }

ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java

@@ -9,17 +9,19 @@ import com.ruoyi.api.service.IToWmsService;
 import com.ruoyi.check.commit.domain.CheckCommitRecord;
 import com.ruoyi.check.commit.service.ICheckCommitRecordService;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.MessageUtils;
 
-import com.ruoyi.in.stockin.domain.InStockin;
 import com.ruoyi.in.stockin.service.IInStockinService;
 import com.ruoyi.in.stockindetail.domain.InStockinDetail;
 import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
 import com.ruoyi.job.mydojob.domain.MydoJob;
 import com.ruoyi.job.mydojob.service.IMydoJobService;
 import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail;
+import com.ruoyi.job.mydojobdetail.domain.PkDetail;
 import com.ruoyi.job.mydojobdetail.service.IMydoJobDetailService;
-import com.ruoyi.job.mydojobdetail.service.impl.MydoJobDetailServiceImpl;
+import com.ruoyi.out.outStockoutDetail.domain.OutStockoutDetail;
+import com.ruoyi.out.outStockoutDetail.service.impl.OutStockoutDetailServiceImpl;
 import com.ruoyi.pda.domain.TrayCodeMakeSure;
 import com.ruoyi.pda.domain.TrayCodeMsg;
 import com.ruoyi.pda.mapper.PdaMapper;
@@ -34,6 +36,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -60,13 +63,14 @@ public class PdaServiceImp implements PdaService {
     private BasStockMapper basStockMapper;
     @Autowired
     private IInStockinService inStockinService;
-
+    @Autowired
+    private OutStockoutDetailServiceImpl outStockoutDetailService;
 
     @Override
     public List<BasStock> selectHasHalfTray(String inStockinDetailId) {
         InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByStockinDetailId(inStockinDetailId);
-        InStockin inStockin = inStockinService.selectInStockinByStockinId(inStockinDetail.getStockinId());
-        inStockinDetail.setSpare4(inStockin.getDepartmentNo());
+//        InStockin inStockin = inStockinService.selectInStockinByStockinId(inStockinDetail.getStockinId());
+//        inStockinDetail.setSpare4(inStockinDetail.getSpare4());
         List<BasStock> hasHalfTray = basStockMapper.selectHasHalfTray(inStockinDetail);
         return hasHalfTray;
     }
@@ -75,16 +79,16 @@ public class PdaServiceImp implements PdaService {
     @Override
     public AjaxResult halfTrayOut(TrayCodeMsg trayCodeMsg) {
         InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByStockinDetailId(trayCodeMsg.getStockinDetailId());
-        InStockin inStockin = inStockinService.selectInStockinByStockinId(inStockinDetail.getStockinId());
-        inStockinDetail.setSpare4(inStockin.getDepartmentNo());
+//        InStockin inStockin = inStockinService.selectInStockinByStockinId(inStockinDetail.getStockinId());
+//        inStockinDetail.setSpare4(inStockin.getDepartmentNo());
         List<BasStock> hasHalfTray = basStockMapper.selectHasHalfTray(inStockinDetail);
         HashMap<String, Object> map = new HashMap<>();
         map.put("v_tray_code", hasHalfTray.get(0).getTrayCode());
-        map.put("v_exit_id",trayCodeMsg.getExitId());
+        map.put("v_exit_id", trayCodeMsg.getExitId());
         pdaMapper.halfTrayOut(map);
-        if(!"10".equals(map.get("v_result").toString())){
+        if (!"10".equals(map.get("v_result").toString())) {
             return AjaxResult.error(map.get("v_resultmsg").toString());
-        }else{
+        } else {
             return AjaxResult.success();
         }
 
@@ -112,21 +116,18 @@ public class PdaServiceImp implements PdaService {
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult bindTray(TrayCodeMakeSure trayCodeMakeSure) {
         StringBuilder errorbulider = new StringBuilder();
-
-
         for (MydoJobDetail mydoJobDetail : trayCodeMakeSure.getMydoJobDetailList()) {
             HashMap<String, Object> map = new HashMap<>();
             map.put("v_tray_code", trayCodeMakeSure.getTrayCode());
             map.put("v_stockin_detail_id", mydoJobDetail.getStockinDetailId());
+            map.put("v_is_bound_accord", trayCodeMakeSure.getIsBoundByAccord());
             map.put("v_quantity", Integer.valueOf(mydoJobDetail.getInQuantity()));
             pdaMapper.bindTray(map);
             if (!"10".equals(map.get("v_result").toString())) {
                 errorbulider.append(mydoJobDetail.getStockinDetailId() + map.get("v_resultmsg").toString());
                 return AjaxResult.error(errorbulider.toString());
             }
-
         }
-
         HashMap<String, Object> map = new HashMap<>();
         map.put("v_tray_code", trayCodeMakeSure.getTrayCode());
         map.put("v_is_full", trayCodeMakeSure.getIsFull());
@@ -134,18 +135,19 @@ public class PdaServiceImp implements PdaService {
         if (!"10".equals(map.get("v_result").toString())) {
             return AjaxResult.error(errorbulider.toString());
         }
-
         return AjaxResult.success();
     }
 
     @Override
-    public AjaxResult tpIn(String trayCode) {
+    public AjaxResult tpIn(TrayCodeMsg trayCodeMsg) {
         HashMap<String, Object> map = new HashMap<>();
-        map.put("v_tray_code", trayCode);
+        map.put("v_tray_code", trayCodeMsg.getTrayCode());
+        map.put("v_tray_type", trayCodeMsg.getTrayType());
+        map.put("v_quantity", Integer.valueOf(trayCodeMsg.getInQuantity()));
         pdaMapper.tpIn(map);
-        if(!"10".equals(map.get("v_result").toString())){
+        if (!"10".equals(map.get("v_result").toString())) {
             return AjaxResult.error(map.get("v_resultmsg").toString());
-        }else{
+        } else {
             return AjaxResult.success();
         }
 
@@ -155,11 +157,11 @@ public class PdaServiceImp implements PdaService {
     public AjaxResult tpOut(TrayCodeMsg trayCodeMsg) {
 
         HashMap<String, Object> map = new HashMap<>();
-        map.put("v_exit_id", trayCodeMsg.getExitId());
+        map.put("v_tray_type", trayCodeMsg.getTrayType());
         pdaMapper.tpOut(map);
-        if(!"10".equals(map.get("v_result").toString())){
+        if (!"10".equals(map.get("v_result").toString())) {
             return AjaxResult.error(map.get("v_resultmsg").toString());
-        }else{
+        } else {
             return AjaxResult.success();
         }
     }
@@ -197,9 +199,10 @@ public class PdaServiceImp implements PdaService {
     @Override
     public AjaxResult selectDetailByPDTray(TrayCodeMakeSure trayCodeMakeSure) {
         MydoJob mydoJob = new MydoJob();
-        mydoJob.setExitId(trayCodeMakeSure.getExitId());
+//        mydoJob.setExitId(trayCodeMakeSure.getExitId());
         mydoJob.setStatus("3");
-        mydoJob.setInOrOut("26");
+        mydoJob.setInOrOut("28");
+        mydoJob.setTrayCode(trayCodeMakeSure.getTrayCode());
         List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectPdMydoJobDetailListByExit(mydoJob);
         return AjaxResult.success(mydoJobDetails);
     }
@@ -237,9 +240,9 @@ public class PdaServiceImp implements PdaService {
     public AjaxResult checkMakeSure(TrayCodeMakeSure trayCodeMakeSure) {
 
         MydoJob mydoJob = new MydoJob();
-        mydoJob.setExitId(trayCodeMakeSure.getExitId());
+        mydoJob.setTrayCode(trayCodeMakeSure.getTrayCode());
         mydoJob.setStatus("3");
-        mydoJob.setInOrOut("26");
+        mydoJob.setInOrOut("28");
         List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectPdMydoJobDetailListByExit(mydoJob);
         if (mydoJobDetails.isEmpty()) {
             return AjaxResult.error("该物料没有盘点出库作业，请检查");
@@ -249,7 +252,7 @@ public class PdaServiceImp implements PdaService {
         if (CollUtil.isNotEmpty(mydoJobDetailList)) {
             boolean flag = mydoJobDetailList.stream().anyMatch(x -> StrUtil.isEmpty(x.getStockId()) && "0".equals(x.getInQuantity()));
             if (flag) {
-                return AjaxResult.warn(MessageUtils.message("warn.message8"));
+                return AjaxResult.warn(MessageUtils.message("盘点数量不可为0"));
             }
             for (MydoJobDetail mydoJobDetail : mydoJobDetailList) {
                 //插入盘点提交表
@@ -287,4 +290,104 @@ public class PdaServiceImp implements PdaService {
         AjaxResult ajaxResult = toWcsService.updateWcsPort(wcsport);
         return ajaxResult;
     }
+
+    @Override
+    public AjaxResult hcoutMakesure(String trayCode) {
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("v_tray_code", trayCode);
+        pdaMapper.hcoutMakesure(map);
+        String result = map.get("v_result").toString();
+        if ("10".equals(result)) {
+            return AjaxResult.success();
+        } else {
+            return AjaxResult.error(map.get("v_resultmsg").toString());
+        }
+    }
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult completeInPk(TrayCodeMakeSure trayCodeMakeSure) {
+        for (PkDetail pkDetail : trayCodeMakeSure.getPkDetailList()) {
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("v_tray_code", trayCodeMakeSure.getTrayCode());
+            map.put("v_in_stockin_detail_id", pkDetail.getStockinDetailId());
+            map.put("v_quantity", pkDetail.getQuantity());
+            map.put("v_cargo_space_id", trayCodeMakeSure.getCargoSpaceId());
+            pdaMapper.completeInPk(map);
+
+            if (!"10".equals(String.valueOf(map.get("v_result")))) {
+                String errorMessage = Objects.toString(map.get("v_result_msg"), "平库入库失败");
+                throw new ServiceException(errorMessage);
+            }
+        }
+
+        return AjaxResult.success();
+    }
+
+    @Override
+    public AjaxResult selectBasStockHc(String trayCode) {
+        BasStock basStock = new BasStock();
+        basStock.setTrayCode(trayCode);
+        List<BasStock> stocks = basStockMapper.selectBasStockListHc(basStock);
+        if (stocks.size() > 0) {
+            return AjaxResult.success(stocks);
+        } else {
+            return AjaxResult.error("无库存信息");
+        }
+    }
+
+    @Override
+    public Integer selectByTrayCodeAndProduct(String trayCode, String productId) {
+        return pdaMapper.selectByTrayCodeAndProduct(trayCode, productId);
+    }
+
+    @Override
+    public void completeOutPk(HashMap<String, Object> map) {
+        pdaMapper.completeOutPk(map);
+    }
+
+    @Override
+    public Integer selectBasStockHcCount(String trayCode, String productId) {
+        BasStock basStock = new BasStock();
+        basStock.setTrayCode(trayCode);
+        basStock.setProductId(productId);
+        List<BasStock> basStocks = basStockMapper.selectBasStockHcCount(basStock);
+        return basStocks.size();
+    }
+
+    @Override
+    public AjaxResult selectBasStockHcs(String trayCode, String stockoutDetailId) {
+        OutStockoutDetail outStockoutDetail = outStockoutDetailService.selectOutStockoutDetailByStockoutDetailId(stockoutDetailId);
+        List<BasStock> stocks = basStockMapper.selectBasStockHcs(trayCode, outStockoutDetail);
+        if (stocks.size() > 0) {
+            return AjaxResult.success(stocks);
+        }
+        {
+            return AjaxResult.error("该托盘无对应库存，请检查！");
+        }
+    }
+
+    @Override
+    public AjaxResult bindTray2(TrayCodeMakeSure trayCodeMakeSure) {
+        String collect = trayCodeMakeSure.getMydoJobDetailList().stream().map(detail -> detail.getStockinDetailId() + ":" + detail.getInQuantity()).collect(Collectors.joining(","));
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("v_tray_code", trayCodeMakeSure.getTrayCode());
+        map.put("v_string", collect);
+        map.put("v_is_bound_accord", trayCodeMakeSure.getIsBoundByAccord());
+        pdaMapper.bindTray(map);
+        if (!"10".equals(map.get("v_result").toString())) {
+            return AjaxResult.error(map.get("v_result").toString());
+        }
+        map.clear();
+        map.put("v_tray_code", trayCodeMakeSure.getTrayCode());
+        map.put("v_is_full", trayCodeMakeSure.getIsFull());
+        pdaMapper.addInJob(map);
+        if (!"10".equals(map.get("v_result").toString())) {
+            return AjaxResult.error(map.get("v_result").toString());
+        }
+        return AjaxResult.success();
+    }
+
+
 }

ruoyi-admin/src/main/java/com/ruoyi/stock/stock/controller/BasStockController.java

@@ -58,9 +58,10 @@ public class BasStockController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('stock:management:query')")
     @GetMapping(value = "/{stockId}")
-    public AjaxResult getInfo(@PathVariable("stockId") String stockId)
+    public AjaxResult getInfo(@PathVariable("stockId") String stockId, @RequestParam(value = "warehouseCode", required = false) String warehouseCode)
     {
-        return success(basStockService.selectBasStockByStockId(stockId));
+        BasStock basStock = basStockService.selectBasStockByStockId2(stockId, warehouseCode);
+        return success(basStock);
     }
 
     /**
@@ -91,9 +92,10 @@ public class BasStockController extends BaseController
     @PreAuthorize("@ss.hasPermi('stock:management:remove')")
     @Log(title = "库存信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{stockIds}")
-    public AjaxResult remove(@PathVariable String[] stockIds)
+    public AjaxResult remove(@PathVariable String[] stockIds,@RequestParam(value = "warehouseCode",required = false) String warehouseCode)
     {
-        return toAjax(basStockService.deleteBasStockByStockIds(stockIds));
+        System.out.println(warehouseCode);
+        return toAjax(basStockService.deleteBasStockByStockIds2(stockIds,warehouseCode));
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java

@@ -11,6 +11,7 @@ import lombok.ToString;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.ai.tool.annotation.ToolParam;
+import org.springframework.data.annotation.Transient;
 
 import java.util.List;
 
@@ -184,6 +185,8 @@ public class BasStock extends BaseEntity
     /** 仓库 */
 //     @Excel(name = "${stock.BasStock.warehouseId}")
     private String warehouseId;
+    @Transient
+    private String warehouseCode;
 
 
     /** 垛型ID */

ruoyi-admin/src/main/java/com/ruoyi/stock/stock/mapper/BasStockMapper.java

@@ -1,6 +1,7 @@
 package com.ruoyi.stock.stock.mapper;
 
 import com.ruoyi.in.stockindetail.domain.InStockinDetail;
+import com.ruoyi.out.outStockoutDetail.domain.OutStockoutDetail;
 import com.ruoyi.stock.stock.domain.BasStock;
 import org.apache.ibatis.annotations.Param;
 
@@ -73,4 +74,20 @@ public interface BasStockMapper
     List<BasStock> getStockBySerial(String trayCode);
 
     List<BasStock> selectHasHalfTray(InStockinDetail inStockinDetail);
+
+    List<BasStock> selectBasStockHcCount(BasStock  basStock);
+
+    List<BasStock> selectBasStockListHc(BasStock basStock);
+
+    BasStock selectBasStockByStockId2(String stockId, String warehouseCode);
+
+    int updateBasStock2(BasStock basStock);
+
+    int deleteBasStockByStockIds2(@Param("stockIds") String[] stockIds, @Param("warehouseCode")String warehouseCode);
+
+    List<BasStock> selectBasStockList2(BasStock basStock);
+
+    List<BasStock> selectBasStockHcs(@Param("trayCode") String trayCode, @Param("out") OutStockoutDetail outStockoutDetail);
+
+    BasStock selectBasStockListTopOne(String trayCode);
 }

ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/IBasStockService.java

@@ -83,4 +83,10 @@ public interface IBasStockService
     AjaxResult resetPdRecord();
 
     List<BasStock> getStockBySerial(String serial);
+
+    BasStock selectBasStockByStockId2(String stockId, String warehouseCode);
+
+    int deleteBasStockByStockIds2(String[] stockIds,String warehouseCode);
+
+    BasStock selectBasStockListTopOne(String trayCode);
 }

ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java

@@ -58,7 +58,7 @@ public class BasStockServiceImpl implements IBasStockService
     @Override
     public List<BasStock> selectBasStockList(BasStock basStock)
     {
-        return basStockMapper.selectBasStockList(basStock);
+        return basStockMapper.selectBasStockList2(basStock);
     }
     /**
      * 无权限查询库存信息列表
@@ -115,10 +115,10 @@ public class BasStockServiceImpl implements IBasStockService
     @Override
     public int updateBasStock(BasStock basStock)
     {
-        BasStock oldBasStock = basStockMapper.selectBasStockByStockId(basStock.getStockId());
+        BasStock oldBasStock = basStockMapper.selectBasStockByStockId2(basStock.getStockId(),basStock.getWarehouseCode());
         insertMaintainRecord(oldBasStock,basStock,"2");
         insertFreezeRecord(oldBasStock,basStock);
-        return basStockMapper.updateBasStock(basStock);
+        return basStockMapper.updateBasStock2(basStock);
     }
 
     private void insertFreezeRecord(BasStock oldBasStock, BasStock basStock) {
@@ -194,6 +194,28 @@ public class BasStockServiceImpl implements IBasStockService
         return basStockMapper.getStockBySerial(trayCode);
     }
 
+    @Override
+    public BasStock selectBasStockByStockId2(String stockId, String warehouseCode) {
+        return basStockMapper.selectBasStockByStockId2(stockId,warehouseCode);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int deleteBasStockByStockIds2(String[] stockIds,String warehouseCode)
+    {
+        for (String stockId : stockIds) {
+            BasStock oldBasStock = basStockMapper.selectBasStockByStockId2(stockId,warehouseCode);
+            insertMaintainRecord(oldBasStock,oldBasStock,"3");
+        }
+        return basStockMapper.deleteBasStockByStockIds2(stockIds,warehouseCode);
+    }
+
+    @Override
+    public BasStock selectBasStockListTopOne(String trayCode) {
+
+        return basStockMapper.selectBasStockListTopOne(trayCode);
+    }
+
     /**
      * 新增库存信息（不记录维护记录）
      *