手持机部分

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")
+//    @Excel(name = "物资名称 ASMAT_NAME")
-    private String productName;
+//    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;
     }
 
 

ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml

@@ -39,6 +39,51 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="printDate"    column="print_date"    />
     </resultMap>
 
+    <resultMap type="OutStockoutDetail" id="OutStockoutDetailResult">
+        <result property="stockoutDetailId"    column="stockout_detail_id"    />
+        <result property="stockoutGuid"    column="stockout_guid"    />
+        <result property="stockoutId"    column="stockout_id"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="productId"    column="product_id"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="quantityX"    column="quantity_x"    />
+        <result property="quantityJ"    column="quantity_j"    />
+        <result property="assignNum"    column="assign_num"    />
+        <result property="assignNumX"    column="assign_num_x"    />
+        <result property="assignNumJ"    column="assign_num_j"    />
+        <result property="allotQuantity"    column="allot_quantity"    />
+        <result property="allotQuantityX"    column="allot_quantity_x"    />
+        <result property="allotQuantityJ"    column="allot_quantity_j"    />
+        <result property="price"    column="price"    />
+        <result property="remark"    column="remark"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="outId"    column="out_id"    />
+        <result property="bukechaiQuantity"    column="bukechai_quantity"    />
+        <result property="kechaiQuantity"    column="kechai_quantity"    />
+        <result property="entryid"    column="entryid"    />
+        <result property="flatQuantity"    column="flat_quantity"    />
+        <result property="fid"    column="fid"    />
+        <result property="erpStockoutId"    column="erp_stockout_id"    />
+        <result property="unit"    column="unit"    />
+        <result property="spec"    column="spec"    />
+
+        <result property="supplierId"    column="supplier_id"    />
+        <result property="cargoNo"    column="cargo_no"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="printDate"    column="print_date"    />
+        <association property="extraField" javaType="ExtraField">
+            <result property="productId"    column="product_id"    />
+            <result property="materialDesc"    column="product_name"    />
+            <result property="englishDesc"    column="englishDesc"    />
+            <result property="length"    column="length"    />
+            <result property="width"    column="width"    />
+            <result property="height"    column="height"    />
+            <result property="volume"    column="volume"    />
+            <result property="netWeight"    column="netWeight"    />
+        </association>
+    </resultMap>
+
     <sql id="selectOutStockoutDetailFinishVo">
         select stockout_detail_id, stockout_guid, stockout_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, assign_num, assign_num_x, assign_num_j, allot_quantity, allot_quantity_x, allot_quantity_j, price, remark, warehouse_id, out_id, bukechai_quantity, kechai_quantity, entryid, flat_quantity, fid, erp_stockout_id, unit, spec, product_name, supplier_id, cargo_no, create_time, print_date from out_stockout_detail_finish
     </sql>
@@ -205,12 +250,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
-    <select id="selectOutStockoutDetailFinishListByStockoutGuid" parameterType="string" resultMap="OutStockoutDetailFinishResult">
+    <select id="selectOutStockoutDetailFinishListByStockoutGuid" parameterType="string" resultMap="OutStockoutDetailResult">
         select d.stockout_detail_id, d.stockout_guid, d.stockout_id, d.lot_no, d.product_guid, d.product_id, d.quantity, d.quantity_x,
                d.quantity_j, d.assign_num, d.assign_num_x, d.assign_num_j, d.allot_quantity, d.allot_quantity_x, d.allot_quantity_j,
                d.price, d.remark, d.warehouse_id, d.out_id, d.bukechai_quantity, d.kechai_quantity, d.entryid, d.flat_quantity, d.fid,
-               d.erp_stockout_id, d.unit, d.spec, p.product_name, d.supplier_id, d.cargo_no, d.create_time, d.print_date from out_stockout_detail_finish d
+               d.erp_stockout_id, d.unit, d.spec, d.supplier_id, d.cargo_no, d.create_time, d.print_date,
-               left join bas_product p on d.product_id = p.product_id
+               bp.product_name, bp.spare1 as englishDesc,
+               bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume
+        from out_stockout_detail_finish d
+               left join bas_product bp on d.product_id = bp.product_id
         where stockout_guid = #{stockoutGuid}
     </select>
 </mapper>

ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml

@@ -32,15 +32,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="erpStockoutId"    column="erp_stockout_id"    />
         <result property="unit"    column="unit"    />
         <result property="spec"    column="spec"    />
-        <result property="productName"    column="product_name"    />
+
         <result property="supplierId"    column="supplier_id"    />
         <result property="cargoNo"    column="cargo_no"    />
         <result property="createTime"    column="create_time"    />
         <result property="printDate"    column="print_date"    />
+        <association property="extraField" javaType="ExtraField">
+            <result property="productId"    column="product_id"    />
+            <result property="materialDesc"    column="product_name"    />
+            <result property="englishDesc"    column="englishDesc"    />
+            <result property="length"    column="length"    />
+            <result property="width"    column="width"    />
+            <result property="height"    column="height"    />
+            <result property="volume"    column="volume"    />
+            <result property="netWeight"    column="netWeight"    />
+        </association>
     </resultMap>
 
     <sql id="selectOutStockoutDetailVo">
-        select stockout_detail_id, stockout_guid, stockout_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, assign_num, assign_num_x, assign_num_j, allot_quantity, allot_quantity_x, allot_quantity_j, price, remark, warehouse_id, out_id, bukechai_quantity, kechai_quantity, entryid, flat_quantity, fid, erp_stockout_id, unit, spec, product_name, supplier_id, cargo_no, create_time, print_date from out_stockout_detail
+        select d.stockout_detail_id, d.stockout_guid, d.stockout_id, d.lot_no, d.product_guid, d.product_id, d.quantity, d.quantity_x,
+               d.quantity_j, d.assign_num, d.assign_num_x, d.assign_num_j, d.allot_quantity, d.allot_quantity_x, d.allot_quantity_j,
+               d.price, d.remark, d.warehouse_id, d.out_id, d.bukechai_quantity, d.kechai_quantity, d.entryid, d.flat_quantity, d.fid,
+               d.erp_stockout_id, d.unit, d.spec,  d.supplier_id, d.cargo_no, d.create_time, d.print_date,
+               bp.product_name, bp.spare1 as englishDesc,
+               bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume
+        from out_stockout_detail d
+                 left join bas_product bp on d.product_id = bp.product_id
     </sql>
 
     <select id="selectOutStockoutDetailList" parameterType="OutStockoutDetail" resultMap="OutStockoutDetailResult">
@@ -51,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stockoutId != null  and stockoutId != ''"> and stockout_id = #{stockoutId}</if>
             <if test="lotNo != null  and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
             <if test="productGuid != null  and productGuid != ''"> and product_guid = #{productGuid}</if>
-            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
+            <if test="productId != null  and productId != ''"> and d.product_id like concat('%', #{productId}, '%')</if>
             <if test="quantity != null "> and quantity = #{quantity}</if>
             <if test="quantityX != null "> and quantity_x = #{quantityX}</if>
             <if test="quantityJ != null "> and quantity_j = #{quantityJ}</if>
@@ -61,8 +78,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="allotQuantity != null "> and allot_quantity = #{allotQuantity}</if>
             <if test="allotQuantityX != null "> and allot_quantity_x = #{allotQuantityX}</if>
             <if test="allotQuantityJ != null "> and allot_quantity_j = #{allotQuantityJ}</if>
-            <if test="price != null  and price != ''"> and price = #{price}</if>
+            <if test="price != null  and price != ''"> and d.price = #{price}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and d.warehouse_id = #{warehouseId}</if>
             <if test="outId != null  and outId != ''"> and out_id = #{outId}</if>
             <if test="bukechaiQuantity != null  and bukechaiQuantity != ''"> and bukechai_quantity = #{bukechaiQuantity}</if>
             <if test="kechaiQuantity != null  and kechaiQuantity != ''"> and kechai_quantity = #{kechaiQuantity}</if>
@@ -70,12 +87,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="flatQuantity != null  and flatQuantity != ''"> and flat_quantity = #{flatQuantity}</if>
             <if test="fid != null  and fid != ''"> and fid = #{fid}</if>
             <if test="erpStockoutId != null  and erpStockoutId != ''"> and erp_stockout_id = #{erpStockoutId}</if>
-            <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
+            <if test="unit != null  and unit != ''"> and d.unit like concat('%', #{unit}, '%')</if>
-            <if test="spec != null  and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
+            <if test="spec != null  and spec != ''"> and d.spec like concat('%', #{spec}, '%')</if>
-            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+
-            <if test="supplierId != null  and supplierId != ''"> and supplier_id like concat('%', #{supplierId}, '%')</if>
+            <if test="supplierId != null  and supplierId != ''"> and d.supplier_id like concat('%', #{supplierId}, '%')</if>
-            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no = #{cargoNo}</if>
+            <if test="cargoNo != null  and cargoNo != ''"> and d.cargo_no = #{cargoNo}</if>
-            <if test="printDate != null  and printDate != ''"> and print_date = #{printDate}</if>
+            <if test="printDate != null  and printDate != ''"> and d.print_date = #{printDate}</if>
         </where>
     </select>
     
@@ -114,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="erpStockoutId != null">erp_stockout_id,</if>
             <if test="unit != null">unit,</if>
             <if test="spec != null">spec,</if>
-            <if test="productName != null">product_name,</if>
+
             <if test="supplierId != null">supplier_id,</if>
             <if test="cargoNo != null">cargo_no,</if>
             <if test="createTime != null">create_time,</if>
@@ -148,7 +165,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="erpStockoutId != null">#{erpStockoutId},</if>
             <if test="unit != null">#{unit},</if>
             <if test="spec != null">#{spec},</if>
-            <if test="productName != null">#{productName},</if>
+
             <if test="supplierId != null">#{supplierId},</if>
             <if test="cargoNo != null">#{cargoNo},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -209,8 +226,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select d.stockout_detail_id, d.stockout_guid, d.stockout_id, d.lot_no, d.product_guid, d.product_id, d.quantity, d.quantity_x,
                d.quantity_j, d.assign_num, d.assign_num_x, d.assign_num_j, d.allot_quantity, d.allot_quantity_x, d.allot_quantity_j,
                d.price, d.remark, d.warehouse_id, d.out_id, d.bukechai_quantity, d.kechai_quantity, d.entryid, d.flat_quantity, d.fid,
-               d.erp_stockout_id, d.unit, d.spec, p.product_name, d.supplier_id, d.cargo_no, d.create_time, d.print_date from out_stockout_detail d
+               d.erp_stockout_id, d.unit, d.spec,  d.supplier_id, d.cargo_no, d.create_time, d.print_date,
-                left join bas_product p on d.product_id = p.product_id
+               bp.product_name, bp.spare1 as englishDesc,
+               bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume
+               from out_stockout_detail d
+                left join bas_product bp on d.product_id = bp.product_id
         where d.stockout_guid = #{stockoutGuid}
     </select>
 </mapper>

ruoyi-ui/src/lang/en.js

@@ -407,8 +407,12 @@ export default {
     exitId: 'Exit ID',
 
     // Material Information
-    materialCode: 'Material Code',
+    productId: 'Material Code',
-    materialDesc: 'Material Desc',
+    materialDesc: 'Material Description',
+    englishDesc: 'English Description',
+    cartonNo: 'Carton No.',
+    packingMethod: 'Packing Method',
+
     stockId: 'Stock ID',
     lotNo: 'Lot No.',
     outQuantity: 'Out Quantity',

ruoyi-ui/src/lang/zh.js

@@ -342,6 +342,11 @@ export default {
     warehouseName:'仓库名称',
     stockoutDetailId: '出库子单编号',
     productId: '物资编码',
+    materialDesc: '物料描述',
+    englishDesc: '英文描述',
+    cartonNo: '箱号',
+    packingMethod: '包装方式',
+    netWeight: '净重',
     lotNo: '批次',
     quantity: '计划数量',
     assignNum: '实际数量',

ruoyi-ui/src/views/out/outStockoutManage.vue

@@ -172,8 +172,11 @@
     <el-table v-loading="detailLoading" :data="outStockDetailList.slice((detailQueryParams.pageNum-1)*detailQueryParams.pageSize, detailQueryParams.pageNum*detailQueryParams.pageSize)" style="margin-top: 20px;">
       <el-table-column :label="$t('outStockoutManage.stockoutDetailId')" align="left" prop="stockoutDetailId" /> <!-- 出库子单编号 -->
       <el-table-column :label="$t('outStockoutManage.productId')" align="left" prop="productId" /> <!-- 物资编码 -->
-      <el-table-column :label="$t('outStockoutManage.productName')" align="left" prop="productName" />
+      <el-table-column :label="$t('outStockoutManage.materialDesc')" align="left" prop="extraField.materialDesc" />
-      <el-table-column :label="$t('outStockoutManage.lotNo')" align="left" prop="lotNo" /> <!-- 批次 -->
+      <el-table-column :label="$t('outStockoutManage.englishDesc')" align="left" prop="extraField.englishDesc"/><!--英文描述-->
+      <el-table-column :label="$t('outStockoutManage.cartonNo')" align="left" prop="extraField.cartonNo"/><!--箱号-->
+      <el-table-column :label="$t('outStockoutManage.packingMethod')" align="left" prop="extraField.packingMethod"/><!--包装方式-->
+      <el-table-column :label="$t('outStockoutManage.netWeight')" align="right" width="120px" prop="extraField.netWeight" /> <!--净重-->
       <el-table-column :label="$t('outStockoutManage.quantity')" align="right" prop="quantity" /> <!-- 计划数量 -->
       <el-table-column :label="$t('outStockoutManage.assignNum')" align="right" prop="assignNum" /> <!-- 实际数量 -->
       <el-table-column :label="$t('outStockoutManage.allotQuantity')" align="right" prop="allotQuantity" /> <!-- 分配数量 -->