From 2e79e1a04e3653c21de348ea1a13468cd47e54db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=80=A1=E8=93=89?= <377046077@qq.com> Date: Tue, 29 Jul 2025 16:56:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=8C=81=E6=9C=BA=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/OutStockoutDetail.java | 28 +++++----- .../com/ruoyi/pda/service/PdaServiceImp.java | 22 +++++++- .../out/OutStockoutDetailFinishMapper.xml | 54 +++++++++++++++++-- .../mapper/out/OutStockoutDetailMapper.xml | 50 +++++++++++------ ruoyi-ui/src/lang/en.js | 8 ++- ruoyi-ui/src/lang/zh.js | 5 ++ ruoyi-ui/src/views/out/outStockoutManage.vue | 7 ++- 7 files changed, 139 insertions(+), 35 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java index eaae687..a98c22a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java +++ b/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()) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java index 1bc7782..8c9d536 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java +++ b/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; } diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml index 685755c..63302ae 100644 --- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml @@ -39,6 +39,51 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ -205,12 +250,15 @@ 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_finish d - left join bas_product p on d.product_id = p.product_id + 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_finish d + left join bas_product bp on d.product_id = bp.product_id where stockout_guid = #{stockoutGuid} \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml index 6b3cc46..a6c1829 100644 --- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml @@ -32,15 +32,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + + + + + + + + + - 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 @@ -114,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" erp_stockout_id, unit, spec, - product_name, + supplier_id, cargo_no, create_time, @@ -148,7 +165,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{erpStockoutId}, #{unit}, #{spec}, - #{productName}, + #{supplierId}, #{cargoNo}, #{createTime}, @@ -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 - left join bas_product p on d.product_id = p.product_id + 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 where d.stockout_guid = #{stockoutGuid} \ No newline at end of file diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js index cef6004..6dd0659 100644 --- a/ruoyi-ui/src/lang/en.js +++ b/ruoyi-ui/src/lang/en.js @@ -407,8 +407,12 @@ export default { exitId: 'Exit ID', // Material Information - materialCode: 'Material Code', - materialDesc: 'Material Desc', + productId: 'Material Code', + materialDesc: 'Material Description', + englishDesc: 'English Description', + cartonNo: 'Carton No.', + packingMethod: 'Packing Method', + stockId: 'Stock ID', lotNo: 'Lot No.', outQuantity: 'Out Quantity', diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js index 0191c08..1e135bd 100644 --- a/ruoyi-ui/src/lang/zh.js +++ b/ruoyi-ui/src/lang/zh.js @@ -342,6 +342,11 @@ export default { warehouseName:'仓库名称', stockoutDetailId: '出库子单编号', productId: '物资编码', + materialDesc: '物料描述', + englishDesc: '英文描述', + cartonNo: '箱号', + packingMethod: '包装方式', + netWeight: '净重', lotNo: '批次', quantity: '计划数量', assignNum: '实际数量', diff --git a/ruoyi-ui/src/views/out/outStockoutManage.vue b/ruoyi-ui/src/views/out/outStockoutManage.vue index 6235635..1925384 100644 --- a/ruoyi-ui/src/views/out/outStockoutManage.vue +++ b/ruoyi-ui/src/views/out/outStockoutManage.vue @@ -172,8 +172,11 @@ - - + + + + +