From 20bbc6019a17e7f78f8dacce2a608dd272258851 Mon Sep 17 00:00:00 2001 From: zxt Date: Mon, 8 Dec 2025 10:26:40 +0800 Subject: [PATCH] =?UTF-8?q?zxt/stock=20=20=E5=BA=93=E5=AD=98=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20(#1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 库存字段和映射修改 前端显示修改 Co-authored-by: escapemoon <18834580489@163.com> Reviewed-on: http://106.13.86.63:10082/lhq/FT542-WMS/pulls/1 --- .gitignore | 1 + .../freeze/domain/BasStockFreezeRecord.java | 9 + .../domain/BasStockMaintainRecord.java | 8 + .../ruoyi/stock/stock/domain/BasStock.java | 111 +++- .../mapper/search/ViewStockDetailMapper.xml | 151 +++-- .../stock/BasStockFreezeRecordMapper.xml | 18 +- .../stock/BasStockMaintainRecordMapper.xml | 22 +- .../resources/mapper/stock/BasStockMapper.xml | 521 +++++++++++------ .../views/search/ViewStockDetail/index.vue | 59 ++ ruoyi-ui/src/views/stock/freeze/index.vue | 2 + ruoyi-ui/src/views/stock/management/index.vue | 283 +++++++++- ruoyi-ui/src/views/stock/record/index.vue | 2 + sql/add_bas_stock_fields.sql | 523 ++++++++++++++++++ sql/bas_stock_mapping_fixed.sql | 120 ++++ 14 files changed, 1572 insertions(+), 258 deletions(-) create mode 100644 sql/add_bas_stock_fields.sql create mode 100644 sql/bas_stock_mapping_fixed.sql diff --git a/.gitignore b/.gitignore index 024ffd5..879446a 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ hs_err_pid* **/target/ /log/ +.vscode/ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java index bb8fa38..a3dec3b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java @@ -90,6 +90,15 @@ public class BasStockFreezeRecord extends BaseEntity /** 物料guid */ // @Excel(name = "${stock.Freeze.productGuid}") private String productGuid; + + /** 单位名称 */ + @Excel(name = "单位名称") + private String unitName; + + /** 产品型号 */ + @Excel(name = "产品型号") + private String productModel; + // 创建时间 @Excel(name = "操作时间", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java index 8352542..2666d8d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java @@ -101,6 +101,14 @@ public class BasStockMaintainRecord extends BaseEntity // @Excel(name = "${stock.Maintain.barCodeQuantity}") private String barCodeQuantity; + /** 单位名称 */ + @Excel(name = "单位名称") + private String unitName; + + /** 产品型号 */ + @Excel(name = "产品型号") + private String productModel; + /** 物料guid */ // @Excel(name = "${stock.Maintain.productGuid}") private String productGuid; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java index d885ef5..353ae45 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java @@ -81,8 +81,7 @@ public class BasStock extends BaseEntity { private String spare8; private String voltage; - @Excel(name = "件次",sort=18) - private String power; + private String phase; private String netWeight; private String grossWeight; @@ -217,4 +216,112 @@ public class BasStock extends BaseEntity { private String cargoNo; @Excel(name = "备注",sort=31) private String remark; + private String power; + + /** 产品型号 */ + @Excel(name = "产品型号") + private String productModel; + + // ---------- 产品明细 pd_ 字段 (来自产品明细 JSON) ---------- + /** 入库明细ID */ + private String pdDetailId; + /** 产品名称（明细） */ + private String pdProductName; + /** 型号（明细） */ + private String pdModel; + /** 单位（明细） */ + private String pdUnit; + /** 单价（明细） */ + private String pdUnitPrice; + /** 辅助单位（明细） */ + private String pdAuxUnit; + /** 产品属性1（明细） */ + private String pdAttr1; + /** 产品属性2（明细） */ + private String pdAttr2; + /** 数量（明细） */ + private String pdQuantity; + /** 入库数（明细） */ + private String pdInQty; + /** 辅助数量（明细） */ + private String pdAuxQuantity; + /** 总价（明细） */ + private String pdTotalPrice; + /** 成本单价（明细） */ + private String pdCostUnitPrice; + /** 总价2（明细） */ + private String pdTotalPrice2; + /** 核算成本总价（明细） */ + private String pdAccountCostTotal; + /** 核算数量（明细） */ + private String pdAccountQuantity; + /** 核算状态（明细） */ + private String pdAccountStatus; + /** 批号（明细） */ + private String pdBatchNo; + /** 序列号（明细） */ + private String pdSerialNo; + /** 生产日期（明细） */ + private String pdProdDate; + /** 有效日期（明细） */ + private String pdValidDate; + /** 到货日期（明细） */ + private String pdArrivalDate; + /** 备注（明细） */ + private String pdRemark; + /** 自定义字段1（明细） */ + private String pdCustom1; + /** 自定义字段2（明细） */ + private String pdCustom2; + /** 自定义字段3（明细） */ + private String pdCustom3; + /** 自定义字段4（明细） */ + private String pdCustom4; + /** 自定义字段5（明细） */ + private String pdCustom5; + /** 自定义字段6（明细） */ + private String pdCustom6; + /** 装卸工（明细） */ + private String pdLoader; + // ---------- SQL 脚本中新增的其他字段 ---------- + /** 集合数据（JSON/序列化） */ + private String Rows; + /** 入库主题 */ + private String Title; + /** 入库id */ + private String Kuin; + /** 入库状态 */ + private String Complete1; + /** 申请人 */ + private String Cateid; + /** 申请日期 */ + private String Date3; + /** 确认日期 */ + private String Date5; + /** 审批人 */ + private String Catein; + /** 审批意见 */ + private String Intro2; + /** 入库备注 */ + private String Intro; + /** 关联其他单据id */ + private String Caigou; + /** 添加时间 */ + private String Date7; + /** 库管id */ + private String Kg; + /** 入库类别 */ + private String Sort1; + /** 入库编号 */ + private String Rkbh; + /** 审批状态 */ + private String Status; + /** 产品明细（JSON/集合） */ + private String KuinList; + /** 客户名称 */ + private String sysIcusIInheritIdIidI413; + /** 磅单编号 */ + private String sysIcusIInheritIdIidI414; + /** 入库车号 */ + private String sysIcusIInheritIdIidI415; } diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml index d0cbcfd..5694d7a 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml @@ -5,81 +5,115 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + + - - - - - + + + - - - - + + + - - + + + - - + + - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - select bs.spare3, --账套 - bs.cargo_space_id, --库位编码 - bs.tray_code, --托盘 - bs.product_id, --产品编码 - bs.product_name,--产品名称 - bp.spec, -- 规格 - bs.quantity, -- 数量 - bs.spare6, -- 金额 - bp.price, --单价 - bp.spare1 as productType, --产品状态 - bp.unit, -- 单位 - bp.cargo_no, --图号 - bs.order_id, --合同号 - bs.spare5, --台次 - bs.power, --件次 - bs.spare8, --质量 - bp.parent_id, --常用编码 - bs.stockin_id, --入库单号 - bs2.supplier_name, --供应商名称 - bs2.supplier_no, --供应商编号 - bw.warehouse_id, --仓库编码 - bw.warehouse_name, --仓库名称 - bs.in_date, --入库时间 - bs.stacking_id, --出库时间 - bs.spare7, --盘点标识 - bs.back_date, --盘点时间 - bp.remark, --备注 - bs.stock_id, --库存编码 - bs.stock_status, --库存状态 - bs.lot_no, --批次号 - bs.out_quantity, - bs.spare4, --来源 - bs.spare1 --用途 - from bas_stock bs + select bs.cargo_space_id, --库位编码 + bs.tray_code, --托盘 + bs.product_id, --产品编码 + bs.product_name,--产品名称 + bs.quantity, -- 数量 + + bs.order_id, --合同号 + + bs.stockin_id, --入库单号 + + bw.warehouse_id, --仓库编码 + bw.warehouse_name, --仓库名称 + bs.in_date, --入库时间 + + bs.back_date, --盘点时间 + + -- bas_stock 的 pd_ 明细字段 + bs.pd_product_name, -- 明细产品名称 + bs.pd_batch_no, -- 明细批次号 + bs.pd_serial_no, -- 明细序列号 + bs.pd_model, -- 明细型号 + bs.pd_unit, -- 明细单位 + bs.pd_unit_price, -- 明细单价 + bs.pd_quantity, -- 明细数量 + bs.pd_total_price, -- 明细金额 + bs.pd_cost_unit_price, + bs.pd_prod_date, -- 明细生产日期 + bs.pd_valid_date, -- 明细有效日期 + bs.pd_arrival_date, -- 明细到货日期 + bs.pd_remark, -- 明细备注 + + bs.stock_id, --库存编码 + bs.stock_status, --库存状态 + bs.lot_no, --批次号 + bs.out_quantity + + from bas_stock bs left join bas_product bp on bs.product_id = bp.product_id left join bas_warehouse bw on bs.warehouse_id = bw.warehouse_id left join bas_cargo_space bcs on bs.cargo_space_id = bcs.cargo_space_id - left join bas_supplier bs2 on bs.phase = bs2.supplier_no + - and stock_id = #{stockId} + and bsfr.stock_id = #{stockId} and bsfr.cargo_space_id = #{cargoSpaceId} and bsfr.tray_code = #{trayCode} - and product_id = #{productId} + and bsfr.product_id = #{productId} and product_name like concat('%', #{productName}, '%') and print_date = #{printDate} and lot_no = #{lotNo} diff --git a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMaintainRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMaintainRecordMapper.xml index d3ee88d..2c8c0a8 100644 --- a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMaintainRecordMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMaintainRecordMapper.xml @@ -25,22 +25,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - - select wh_guid, stock_id, bsmr.cargo_space_id,bw.warehouse_name, bcs.cargo_space_name, bsmr.tray_code, product_id, product_name, print_date, lot_no, old_quantity, quantity, method, bsmr.warehouse_id, create_time, stock_detail_id, operating_target, bar_code_old_quantity, bar_code_quantity, product_guid - from bas_stock_maintain_record bsmr - left join bas_cargo_space bcs on bsmr.cargo_space_id=bcs.cargo_space_id - left join bas_warehouse bw on bsmr.warehouse_id=bw.warehouse_id - + + select bsmr.wh_guid, bsmr.stock_id, bsmr.cargo_space_id, bw.warehouse_name, bcs.cargo_space_name, bsmr.tray_code, + bsmr.product_id, bsmr.product_name, bsmr.print_date, bsmr.lot_no, bsmr.old_quantity, bsmr.quantity, bsmr.method, + bsmr.warehouse_id, bsmr.create_time, bsmr.stock_detail_id, bsmr.operating_target, bsmr.bar_code_old_quantity, + bsmr.bar_code_quantity, bsmr.product_guid + + from bas_stock_maintain_record bsmr + left join bas_cargo_space bcs on bsmr.cargo_space_id = bcs.cargo_space_id + left join bas_warehouse bw on bsmr.warehouse_id = bw.warehouse_id + left join bas_stock bs on bsmr.stock_id = bs.stock_id + @@ -123,20 +185,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bs.in_type = #{inType} and bs.in_class_id = #{inClassId} and bs.warehouse_id = #{warehouseId} - and bs.stacking_id = #{stackingId} - and bs.spare1 = #{spare1} - and bs.spare2 = #{spare2} - and bs.spare3 = #{spare3} - and bs.spare4 = #{spare4} - and bs.spare5 = #{spare5} - and bs.spare6 = #{spare6} - and bs.voltage = #{voltage} - and bs.power = #{power} - and bs.phase = #{phase} - and bs.net_weight = #{netWeight} - and bs.gross_weight = #{grossWeight} - and bs.distribution = #{distribution} - and bs.model = #{model} + + + + and bp.unit like concat('%', #{unit}, '%') + and bp.model like concat('%', #{productModel}, '%') and bs.order_id = #{orderId} and bs.product_id = #{productId} and bcs.status = #{cargoSpaceStockStatus} @@ -147,13 +200,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bcs.the_column = #{theColumn} and bp.spec = #{spec} and bp.parent_id = #{parentId} - and bs2.supplier_no = #{supplierId} - and bs2.supplier_name = #{supplierName} + and bp.price = #{price} and bs.in_date >= #{inDateStart} and bs.in_date <= #{inDateEnd} and bp.spare1 = #{productType} + + and bs.pd_product_name like concat('%', #{pdProductName}, '%') + and bs.pd_batch_no = #{pdBatchNo} + and bs.pd_serial_no = #{pdSerialNo} + @@ -166,6 +223,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into bas_stock + stock_id, cargo_space_id, stock_status, @@ -183,27 +241,73 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" in_type, in_class_id, warehouse_id, - stacking_id, - spare1, - spare2, - spare3, - spare4, - spare5, - spare6, + + + Rows, + Title, + Kuin, + Complete1, + Cateid, + Date3, + Date5, + Catein, + Intro2, + Intro, + Caigou, + Date7, + Kg, + Sort1, + Rkbh, + Status, + KuinList, + sysIcusIInheritIdIidI413, + sysIcusIInheritIdIidI414, + sysIcusIInheritIdIidI415, + + + pd_detail_id, + pd_product_name, + pd_model, + pd_unit, + pd_unit_price, + pd_aux_unit, + pd_attr1, + pd_attr2, + pd_quantity, + pd_in_qty, + pd_aux_quantity, + pd_total_price, + pd_cost_unit_price, + pd_total_price_2, + pd_account_cost_total, + pd_account_quantity, + pd_account_status, + pd_batch_no, + pd_serial_no, + pd_prod_date, + pd_valid_date, + pd_arrival_date, + pd_remark, + pd_custom1, + pd_custom2, + pd_custom3, + pd_custom4, + pd_custom5, + pd_custom6, + pd_loader, + product_id, product_name, - voltage, - power, - phase, - net_weight, - gross_weight, - distribution, - model, - order_id, - spare7, - spare8, + + + + + + + + #{stockId}, #{cargoSpaceId}, #{stockStatus}, @@ -221,25 +325,68 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{inType}, #{inClassId}, #{warehouseId}, - #{stackingId}, - #{spare1}, - #{spare2}, - #{spare3}, - #{spare4}, - #{spare5}, - #{spare6}, + + + #{Rows}, + #{Title}, + #{Kuin}, + #{Complete1}, + #{Cateid}, + #{Date3}, + #{Date5}, + #{Catein}, + #{Intro2}, + #{Intro}, + #{Caigou}, + #{Date7}, + #{Kg}, + #{Sort1}, + #{Rkbh}, + #{Status}, + #{KuinList}, + #{sysIcusIInheritIdIidI413}, + #{sysIcusIInheritIdIidI414}, + #{sysIcusIInheritIdIidI415}, + + + #{pdDetailId}, + #{pdProductName}, + #{pdModel}, + #{pdUnit}, + #{pdUnitPrice}, + #{pdAuxUnit}, + #{pdAttr1}, + #{pdAttr2}, + #{pdQuantity}, + #{pdInQty}, + #{pdAuxQuantity}, + #{pdTotalPrice}, + #{pdCostUnitPrice}, + #{pdTotalPrice2}, + #{pdAccountCostTotal}, + #{pdAccountQuantity}, + #{pdAccountStatus}, + #{pdBatchNo}, + #{pdSerialNo}, + #{pdProdDate}, + #{pdValidDate}, + #{pdArrivalDate}, + #{pdRemark}, + #{pdCustom1}, + #{pdCustom2}, + #{pdCustom3}, + #{pdCustom4}, + #{pdCustom5}, + #{pdCustom6}, + #{pdLoader}, + #{productId}, #{productName}, - #{voltage}, - #{power}, - #{phase}, - #{netWeight}, - #{grossWeight}, - #{distribution}, - #{model}, - #{orderId}, - #{spare7}, - #{spare8}, + + + + + @@ -262,35 +409,83 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" in_type = #{inType}, in_class_id = #{inClassId}, warehouse_id = #{warehouseId}, - stacking_id = #{stackingId}, - spare1 = #{spare1}, - spare2 = #{spare2}, - spare3 = #{spare3}, - spare4 = #{spare4}, - spare5 = #{spare5}, - spare6 = #{spare6}, + + product_id = #{productId}, - product_name = #{productName}, - voltage = #{voltage}, - power = #{power}, - phase = #{phase}, - net_weight = #{netWeight}, - gross_weight = #{grossWeight}, - distribution = #{distribution}, - model = #{model}, + + + + + + + + order_id = #{orderId}, - spare7 = #{spare7}, - spare8 = #{spare8}, + + + Rows = #{Rows}, + Title = #{Title}, + Kuin = #{Kuin}, + Complete1 = #{Complete1}, + Cateid = #{Cateid}, + Date3 = #{Date3}, + Date5 = #{Date5}, + Catein = #{Catein}, + Intro2 = #{Intro2}, + Intro = #{Intro}, + Caigou = #{Caigou}, + Date7 = #{Date7}, + Kg = #{Kg}, + Sort1 = #{Sort1}, + Rkbh = #{Rkbh}, + Status = #{Status}, + KuinList = #{KuinList}, + sysIcusIInheritIdIidI413 = #{sysIcusIInheritIdIidI413}, + sysIcusIInheritIdIidI414 = #{sysIcusIInheritIdIidI414}, + sysIcusIInheritIdIidI415 = #{sysIcusIInheritIdIidI415}, + + pd_detail_id = #{pdDetailId}, + pd_product_name = #{pdProductName}, + pd_model = #{pdModel}, + pd_unit = #{pdUnit}, + pd_unit_price = #{pdUnitPrice}, + pd_aux_unit = #{pdAuxUnit}, + pd_attr1 = #{pdAttr1}, + pd_attr2 = #{pdAttr2}, + pd_quantity = #{pdQuantity}, + pd_in_qty = #{pdInQty}, + pd_aux_quantity = #{pdAuxQuantity}, + pd_total_price = #{pdTotalPrice}, + pd_cost_unit_price = #{pdCostUnitPrice}, + pd_total_price_2 = #{pdTotalPrice2}, + pd_account_cost_total = #{pdAccountCostTotal}, + pd_account_quantity = #{pdAccountQuantity}, + pd_account_status = #{pdAccountStatus}, + pd_batch_no = #{pdBatchNo}, + pd_serial_no = #{pdSerialNo}, + pd_prod_date = #{pdProdDate}, + pd_valid_date = #{pdValidDate}, + pd_arrival_date = #{pdArrivalDate}, + pd_remark = #{pdRemark}, + pd_custom1 = #{pdCustom1}, + pd_custom2 = #{pdCustom2}, + pd_custom3 = #{pdCustom3}, + pd_custom4 = #{pdCustom4}, + pd_custom5 = #{pdCustom5}, + pd_custom6 = #{pdCustom6}, + pd_loader = #{pdLoader}, where stock_id = #{stockId} INSERT INTO bas_stock - (stock_id,cargo_space_id,stock_status,product_status,lot_no,in_date,back_date,product_guid,quantity,job_id,tray_code,out_quantity,stockin_detail_id,stockin_id,in_type,in_class_id,warehouse_id,stacking_id,spare1,spare2,spare3,spare4,spare5,spare6,product_id,product_name,voltage,power,phase,net_weight,gross_weight,distribution,model,order_id,spare7,spare8) + (stock_id,cargo_space_id,stock_status,product_status,lot_no,in_date,back_date,product_guid,quantity,job_id,tray_code,out_quantity,stockin_detail_id,stockin_id,in_type,in_class_id,warehouse_id,product_id,product_name,/*voltage,net_weight,gross_weight,distribution,*/order_id, + pd_detail_id,pd_product_name,pd_model,pd_unit,pd_unit_price,pd_aux_unit,pd_attr1,pd_attr2,pd_quantity,pd_in_qty,pd_aux_quantity,pd_total_price,pd_cost_unit_price,pd_total_price_2,pd_account_cost_total,pd_account_quantity,pd_account_status,pd_batch_no,pd_serial_no,pd_prod_date,pd_valid_date,pd_arrival_date,pd_remark,pd_custom1,pd_custom2,pd_custom3,pd_custom4,pd_custom5,pd_custom6,pd_loader) VALUES - (#{item.stockId},#{item.cargoSpaceId},#{item.stockStatus},#{item.productStatus},#{item.lotNo},#{item.inDate},#{item.backDate},#{item.productGuid},#{item.quantity},#{item.jobId},#{item.trayCode},#{item.outQuantity},#{item.stockinDetailId},#{item.stockinId},#{item.inType},#{item.inClassId},#{item.warehouseId},#{item.stackingId},#{item.spare1},#{item.spare2},#{item.spare3},#{item.spare4},#{item.spare5},#{item.spare6},#{item.productId} - ,#{item.productName},#{item.voltage},#{item.power},#{item.phase},#{item.netWeight},#{item.grossWeight},#{item.distribution},#{item.model},#{item.orderId},#{item.spare7},#{item.spare8}) + (#{item.stockId},#{item.cargoSpaceId},#{item.stockStatus},#{item.productStatus},#{item.lotNo},#{item.inDate},#{item.backDate},#{item.productGuid},#{item.quantity},#{item.jobId},#{item.trayCode},#{item.outQuantity},#{item.stockinDetailId},#{item.stockinId},#{item.inType},#{item.inClassId},#{item.warehouseId},#{item.productId} + ,#{item.productName},/*#{item.voltage},#{item.netWeight},#{item.grossWeight},#{item.distribution},*/#{item.orderId}, + #{item.pdDetailId},#{item.pdProductName},#{item.pdModel},#{item.pdUnit},#{item.pdUnitPrice},#{item.pdAuxUnit},#{item.pdAttr1},#{item.pdAttr2},#{item.pdQuantity},#{item.pdInQty},#{item.pdAuxQuantity},#{item.pdTotalPrice},#{item.pdCostUnitPrice},#{item.pdTotalPrice2},#{item.pdAccountCostTotal},#{item.pdAccountQuantity},#{item.pdAccountStatus},#{item.pdBatchNo},#{item.pdSerialNo},#{item.pdProdDate},#{item.pdValidDate},#{item.pdArrivalDate},#{item.pdRemark},#{item.pdCustom1},#{item.pdCustom2},#{item.pdCustom3},#{item.pdCustom4},#{item.pdCustom5},#{item.pdCustom6},#{item.pdLoader}) @@ -298,7 +493,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update bas_stock set stock_status = #{stockStatus} where tray_code = #{trayCode} - update bas_stock set spare7 = '0' + update bas_stock set pd_account_status = '0' diff --git a/ruoyi-ui/src/views/search/ViewStockDetail/index.vue b/ruoyi-ui/src/views/search/ViewStockDetail/index.vue index 902ddc7..be37e36 100644 --- a/ruoyi-ui/src/views/search/ViewStockDetail/index.vue +++ b/ruoyi-ui/src/views/search/ViewStockDetail/index.vue @@ -422,6 +422,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
确定 @@ -529,6 +572,22 @@ export default { spec: null, unit: null, price: null + , + // pd_ 明细字段 + pdDetailId: null, + pdProductName: null, + pdModel: null, + pdUnit: null, + pdUnitPrice: null, + pdQuantity: null, + pdTotalPrice: null, + pdBatchNo: null, + pdSerialNo: null, + pdProdDate: null, + pdValidDate: null, + pdArrivalDate: null, + pdRemark: null, + pdLoader: null } this.resetForm("form") }, diff --git a/ruoyi-ui/src/views/stock/freeze/index.vue b/ruoyi-ui/src/views/stock/freeze/index.vue index a66f1a8..70dda9f 100644 --- a/ruoyi-ui/src/views/stock/freeze/index.vue +++ b/ruoyi-ui/src/views/stock/freeze/index.vue @@ -60,6 +60,8 @@ +