手持机部分

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

@@ -1,6 +1,8 @@
 package com.ruoyi.out.outStockoutDetail.domain;
 
 import java.math.BigDecimal;
+
+import com.ruoyi.common.domain.ExtraField;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -121,8 +123,8 @@ public class OutStockoutDetail extends BaseEntity
     private String spec;
 
     /** 物资名称 ASMAT_NAME */
-    @Excel(name = "物资名称 ASMAT_NAME")
-    private String productName;
+//    @Excel(name = "物资名称 ASMAT_NAME")
+//    private String productName;
 
     /** 供应商代码 SUPPLIER_CODE */
     @Excel(name = "供应商代码 SUPPLIER_CODE")
@@ -136,6 +138,10 @@ public class OutStockoutDetail extends BaseEntity
     @Excel(name = "生产日期")
     private String printDate;
 
+    private ExtraField extraField;
+
+
+
     public void setStockoutDetailId(String stockoutDetailId) 
     {
         this.stockoutDetailId = stockoutDetailId;
@@ -396,15 +402,6 @@ public class OutStockoutDetail extends BaseEntity
         return spec;
     }
 
-    public void setProductName(String productName) 
-    {
-        this.productName = productName;
-    }
-
-    public String getProductName() 
-    {
-        return productName;
-    }
 
     public void setSupplierId(String supplierId) 
     {
@@ -436,6 +433,14 @@ public class OutStockoutDetail extends BaseEntity
         return printDate;
     }
 
+    public ExtraField getExtraField() {
+        return extraField;
+    }
+
+    public void setExtraField(ExtraField extraField) {
+        this.extraField = extraField;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -466,7 +471,6 @@ public class OutStockoutDetail extends BaseEntity
             .append("erpStockoutId", getErpStockoutId())
             .append("unit", getUnit())
             .append("spec", getSpec())
-            .append("productName", getProductName())
             .append("supplierId", getSupplierId())
             .append("cargoNo", getCargoNo())
             .append("createTime", getCreateTime())

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

@@ -3,9 +3,13 @@ package com.ruoyi.pda.service;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace;
 import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService;
 import com.ruoyi.bas.container.domain.BasContainer;
+import com.ruoyi.bas.container.service.IBasContainerService;
 import com.ruoyi.bas.containerDetails.domain.BasContainerDetails;
 import com.ruoyi.bas.containerDetails.service.IBasContainerDetailsService;
 import com.ruoyi.bas.port.domain.BasProductPort;
@@ -93,6 +97,8 @@ public class PdaServiceImp implements PdaService {
     private IBasTagService basTagService;
     @Autowired
     private IBasWarehouseService basWarehouseService;
+    @Autowired
+    private IBasContainerService basContainerService;
 
     /**
      * 空托盘入库
@@ -580,10 +586,24 @@ public class PdaServiceImp implements PdaService {
 
             }
         }
+        //通过料架查找站点
+        BasContainer basContainer1 = basContainerService.selectBasContainerByContainerId(basContainer.getContainerId());
+        String startPoint = basContainer1.getPortName();
         //todo 调用agv搬运接口
+        //使用HttpUtil post请求，参数为startPoint，endPoint，和containerCode
+        String result = HttpUtil.post("http://192.168.1.100:8080/agv/api/receiveAgvMoveJob", "startPoint=" + startPoint + "&endPoint=" + endPoint + "&containerCode=" + basContainer.getContainerId());
+        //接口的返回结果为AjaxResult,从result中获取code
+
+            //获取code
+            int code = JSONObject.parseObject(result).getIntValue("code");
+            if(code==200){
+                return AjaxResult.success(result);
+            }else{
+                return AjaxResult.warn(JSONObject.parseObject(result).getString("msg"));
+            }
+
 
 
-        return null;
     }