From a71caaef81ba43c34a7b4d538ac5dcab2c4d899a Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Wed, 7 Jan 2026 10:08:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=AE=A1=E7=90=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewProductAndStockController.java | 25 +- .../domain/ViewProductAndStock.java | 230 +++++++----------- .../mapper/ViewProductAndStockMapper.java | 20 +- .../service/IViewProductAndStockService.java | 20 +- .../impl/ViewProductAndStockServiceImpl.java | 24 +- .../mapper/out/OutStockoutDetailMapper.xml | 4 +- .../ViewProductAndStockMapper.xml | 83 ++----- ruoyi-ui/src/views/job/outJobManagement.vue | 44 ++-- ruoyi-ui/src/views/out/addOutStockout.vue | 99 ++++---- ruoyi-ui/src/views/out/outStockoutManage.vue | 50 ++-- ruoyi-ui/src/views/stock/pointOut.vue | 32 ++- 11 files changed, 242 insertions(+), 389 deletions(-) rename ruoyi-admin/src/main/resources/mapper/{out => productAndStock}/ViewProductAndStockMapper.xml (58%) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/controller/ViewProductAndStockController.java b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/controller/ViewProductAndStockController.java index 5fc381e..41b36e7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/controller/ViewProductAndStockController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/controller/ViewProductAndStockController.java @@ -25,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo; * 库存物资Controller * * @author ruoyi - * @date 2025-09-12 + * @date 2026-01-06 */ @RestController @RequestMapping("/out/productAndStock") @@ -37,7 +37,7 @@ public class ViewProductAndStockController extends BaseController /** * 查询库存物资列表 */ - @PreAuthorize("@ss.hasPermi('out:productAndStock:list')") + @PreAuthorize("@ss.hasPermi('productAndStock:productAndStock:list')") @GetMapping("/list") public TableDataInfo list(ViewProductAndStock viewProductAndStock) { @@ -45,22 +45,11 @@ public class ViewProductAndStockController extends BaseController List list = viewProductAndStockService.selectViewProductAndStockList(viewProductAndStock); return getDataTable(list); } - /** - * 查询库存物资列表 - */ - @PreAuthorize("@ss.hasPermi('out:productAndStock:list')") - @GetMapping("/pd/list") - public TableDataInfo pdList(ViewProductAndStock viewProductAndStock) - { - startPage(); - List list = viewProductAndStockService.selectViewProductAndStockPdList(viewProductAndStock); - return getDataTable(list); - } /** * 导出库存物资列表 */ - @PreAuthorize("@ss.hasPermi('out:productAndStock:export')") + @PreAuthorize("@ss.hasPermi('productAndStock:productAndStock:export')") @Log(title = "库存物资", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, ViewProductAndStock viewProductAndStock) @@ -73,7 +62,7 @@ public class ViewProductAndStockController extends BaseController /** * 获取库存物资详细信息 */ - @PreAuthorize("@ss.hasPermi('out:productAndStock:query')") + @PreAuthorize("@ss.hasPermi('productAndStock:productAndStock:query')") @GetMapping(value = "/{onlyIdentity}") public AjaxResult getInfo(@PathVariable("onlyIdentity") Long onlyIdentity) { @@ -83,7 +72,7 @@ public class ViewProductAndStockController extends BaseController /** * 新增库存物资 */ - @PreAuthorize("@ss.hasPermi('out:productAndStock:add')") + @PreAuthorize("@ss.hasPermi('productAndStock:productAndStock:add')") @Log(title = "库存物资", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody ViewProductAndStock viewProductAndStock) @@ -94,7 +83,7 @@ public class ViewProductAndStockController extends BaseController /** * 修改库存物资 */ - @PreAuthorize("@ss.hasPermi('out:productAndStock:edit')") + @PreAuthorize("@ss.hasPermi('productAndStock:productAndStock:edit')") @Log(title = "库存物资", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody ViewProductAndStock viewProductAndStock) @@ -105,7 +94,7 @@ public class ViewProductAndStockController extends BaseController /** * 删除库存物资 */ - @PreAuthorize("@ss.hasPermi('out:productAndStock:remove')") + @PreAuthorize("@ss.hasPermi('productAndStock:productAndStock:remove')") @Log(title = "库存物资", businessType = BusinessType.DELETE) @DeleteMapping("/{onlyIdentitys}") public AjaxResult remove(@PathVariable Long[] onlyIdentitys) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/domain/ViewProductAndStock.java b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/domain/ViewProductAndStock.java index 593ec2b..f98ce57 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/domain/ViewProductAndStock.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/domain/ViewProductAndStock.java @@ -1,6 +1,5 @@ package com.ruoyi.out.productAndStock.domain; -import java.math.BigDecimal; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -8,9 +7,9 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 库存物资对象 view_product_and_stock - * + * * @author ruoyi - * @date 2025-09-12 + * @date 2026-01-06 */ public class ViewProductAndStock extends BaseEntity { @@ -20,278 +19,226 @@ public class ViewProductAndStock extends BaseEntity @Excel(name = "序号") private Long onlyIdentity; - /** 品号 */ - @Excel(name = "品号") + /** 物料编码 */ + @Excel(name = "物料编码") private String productId; - /** 批次号 */ - @Excel(name = "批次号") + /** 批号 */ + @Excel(name = "批号") private String lotNo; - /** 品名 */ - @Excel(name = "品名") + /** 物料名称 */ + @Excel(name = "物料名称") private String productName; - /** 数量 */ - @Excel(name = "数量") - private BigDecimal quantity; + /** 库存数量 */ + @Excel(name = "库存数量") + private String quantity; - /** 仓库 */ - @Excel(name = "仓库") + /** 仓库编码 */ + @Excel(name = "仓库编码") private String warehouseId; - /** 规格 */ - @Excel(name = "规格") + /** 供应商名称 */ + @Excel(name = "供应商名称") + private String stackingId; + + /** 层次关系 */ + @Excel(name = "层次关系") private String spare1; - /** 单位 */ - @Excel(name = "单位") + /** 上层物料 */ + @Excel(name = "上层物料") + private String spare2; + + /** 顶层物料 */ + @Excel(name = "顶层物料") private String spare3; - /** 型号 */ - @Excel(name = "型号") + /** 项目号 */ + @Excel(name = "项目号") private String spare4; - /** 颜色 */ - @Excel(name = "颜色") + /** 合同号 */ + @Excel(name = "合同号") private String spare5; - /** 序列号 */ - @Excel(name = "序列号") + /** 销售订单号 */ + @Excel(name = "销售订单号") private String spare6; - @Excel(name = "是否盘点") - private String spare7; - /** 电压 */ - @Excel(name = "电压") + /** 供应商编码 */ + @Excel(name = "供应商编码") private String voltage; - /** 功率 */ - @Excel(name = "功率") + /** 规格型号 */ + @Excel(name = "规格型号") private String power; - /** 相位 */ - @Excel(name = "相位") + /** 计量单位 */ + @Excel(name = "计量单位") private String phase; - /** 净重 */ - @Excel(name = "净重") - private BigDecimal netWeight; - - /** 毛重 */ - @Excel(name = "毛重") - private BigDecimal grossWeight; - - /** 分销 */ - @Excel(name = "分销") - private String distribution; - - /** 机型 */ - @Excel(name = "机型") - private String model; - - /** 订单号 */ - @Excel(name = "订单号") - private String orderId; - - public String getSpare7() { - return spare7; - } - - public void setSpare7(String spare7) { - this.spare7 = spare7; - } - - public void setOnlyIdentity(Long onlyIdentity) + public void setOnlyIdentity(Long onlyIdentity) { this.onlyIdentity = onlyIdentity; } - public Long getOnlyIdentity() + public Long getOnlyIdentity() { return onlyIdentity; } - public void setProductId(String productId) + public void setProductId(String productId) { this.productId = productId; } - public String getProductId() + public String getProductId() { return productId; } - public void setLotNo(String lotNo) + public void setLotNo(String lotNo) { this.lotNo = lotNo; } - public String getLotNo() + public String getLotNo() { return lotNo; } - public void setProductName(String productName) + public void setProductName(String productName) { this.productName = productName; } - public String getProductName() + public String getProductName() { return productName; } - public void setQuantity(BigDecimal quantity) + public void setQuantity(String quantity) { this.quantity = quantity; } - public BigDecimal getQuantity() + public String getQuantity() { return quantity; } - public void setWarehouseId(String warehouseId) + public void setWarehouseId(String warehouseId) { this.warehouseId = warehouseId; } - public String getWarehouseId() + public String getWarehouseId() { return warehouseId; } - public void setSpare1(String spare1) + public void setStackingId(String stackingId) + { + this.stackingId = stackingId; + } + + public String getStackingId() + { + return stackingId; + } + + public void setSpare1(String spare1) { this.spare1 = spare1; } - public String getSpare1() + public String getSpare1() { return spare1; } - public void setSpare3(String spare3) + public void setSpare2(String spare2) + { + this.spare2 = spare2; + } + + public String getSpare2() + { + return spare2; + } + + public void setSpare3(String spare3) { this.spare3 = spare3; } - public String getSpare3() + public String getSpare3() { return spare3; } - public void setSpare4(String spare4) + public void setSpare4(String spare4) { this.spare4 = spare4; } - public String getSpare4() + public String getSpare4() { return spare4; } - public void setSpare5(String spare5) + public void setSpare5(String spare5) { this.spare5 = spare5; } - public String getSpare5() + public String getSpare5() { return spare5; } - public void setSpare6(String spare6) + public void setSpare6(String spare6) { this.spare6 = spare6; } - public String getSpare6() + public String getSpare6() { return spare6; } - public void setVoltage(String voltage) + public void setVoltage(String voltage) { this.voltage = voltage; } - public String getVoltage() + public String getVoltage() { return voltage; } - public void setPower(String power) + public void setPower(String power) { this.power = power; } - public String getPower() + public String getPower() { return power; } - public void setPhase(String phase) + public void setPhase(String phase) { this.phase = phase; } - public String getPhase() + public String getPhase() { return phase; } - public void setNetWeight(BigDecimal netWeight) - { - this.netWeight = netWeight; - } - - public BigDecimal getNetWeight() - { - return netWeight; - } - - public void setGrossWeight(BigDecimal grossWeight) - { - this.grossWeight = grossWeight; - } - - public BigDecimal getGrossWeight() - { - return grossWeight; - } - - public void setDistribution(String distribution) - { - this.distribution = distribution; - } - - public String getDistribution() - { - return distribution; - } - - public void setModel(String model) - { - this.model = model; - } - - public String getModel() - { - return model; - } - - public void setOrderId(String orderId) - { - this.orderId = orderId; - } - - public String getOrderId() - { - return orderId; - } - @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -301,7 +248,9 @@ public class ViewProductAndStock extends BaseEntity .append("productName", getProductName()) .append("quantity", getQuantity()) .append("warehouseId", getWarehouseId()) + .append("stackingId", getStackingId()) .append("spare1", getSpare1()) + .append("spare2", getSpare2()) .append("spare3", getSpare3()) .append("spare4", getSpare4()) .append("spare5", getSpare5()) @@ -309,11 +258,6 @@ public class ViewProductAndStock extends BaseEntity .append("voltage", getVoltage()) .append("power", getPower()) .append("phase", getPhase()) - .append("netWeight", getNetWeight()) - .append("grossWeight", getGrossWeight()) - .append("distribution", getDistribution()) - .append("model", getModel()) - .append("orderId", getOrderId()) .toString(); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/mapper/ViewProductAndStockMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/mapper/ViewProductAndStockMapper.java index bd83a92..386a65f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/mapper/ViewProductAndStockMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/mapper/ViewProductAndStockMapper.java @@ -5,15 +5,15 @@ import com.ruoyi.out.productAndStock.domain.ViewProductAndStock; /** * 库存物资Mapper接口 - * + * * @author ruoyi - * @date 2025-09-12 + * @date 2026-01-06 */ -public interface ViewProductAndStockMapper +public interface ViewProductAndStockMapper { /** * 查询库存物资 - * + * * @param onlyIdentity 库存物资主键 * @return 库存物资 */ @@ -21,7 +21,7 @@ public interface ViewProductAndStockMapper /** * 查询库存物资列表 - * + * * @param viewProductAndStock 库存物资 * @return 库存物资集合 */ @@ -29,7 +29,7 @@ public interface ViewProductAndStockMapper /** * 新增库存物资 - * + * * @param viewProductAndStock 库存物资 * @return 结果 */ @@ -37,7 +37,7 @@ public interface ViewProductAndStockMapper /** * 修改库存物资 - * + * * @param viewProductAndStock 库存物资 * @return 结果 */ @@ -45,7 +45,7 @@ public interface ViewProductAndStockMapper /** * 删除库存物资 - * + * * @param onlyIdentity 库存物资主键 * @return 结果 */ @@ -53,11 +53,9 @@ public interface ViewProductAndStockMapper /** * 批量删除库存物资 - * + * * @param onlyIdentitys 需要删除的数据主键集合 * @return 结果 */ public int deleteViewProductAndStockByOnlyIdentitys(Long[] onlyIdentitys); - - List selectViewProductAndStockPdList(ViewProductAndStock viewProductAndStock); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/service/IViewProductAndStockService.java b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/service/IViewProductAndStockService.java index 0b36e25..268688b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/service/IViewProductAndStockService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/service/IViewProductAndStockService.java @@ -5,15 +5,15 @@ import com.ruoyi.out.productAndStock.domain.ViewProductAndStock; /** * 库存物资Service接口 - * + * * @author ruoyi - * @date 2025-09-12 + * @date 2026-01-06 */ -public interface IViewProductAndStockService +public interface IViewProductAndStockService { /** * 查询库存物资 - * + * * @param onlyIdentity 库存物资主键 * @return 库存物资 */ @@ -21,7 +21,7 @@ public interface IViewProductAndStockService /** * 查询库存物资列表 - * + * * @param viewProductAndStock 库存物资 * @return 库存物资集合 */ @@ -29,7 +29,7 @@ public interface IViewProductAndStockService /** * 新增库存物资 - * + * * @param viewProductAndStock 库存物资 * @return 结果 */ @@ -37,7 +37,7 @@ public interface IViewProductAndStockService /** * 修改库存物资 - * + * * @param viewProductAndStock 库存物资 * @return 结果 */ @@ -45,7 +45,7 @@ public interface IViewProductAndStockService /** * 批量删除库存物资 - * + * * @param onlyIdentitys 需要删除的库存物资主键集合 * @return 结果 */ @@ -53,11 +53,9 @@ public interface IViewProductAndStockService /** * 删除库存物资信息 - * + * * @param onlyIdentity 库存物资主键 * @return 结果 */ public int deleteViewProductAndStockByOnlyIdentity(Long onlyIdentity); - - List selectViewProductAndStockPdList(ViewProductAndStock viewProductAndStock); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/service/impl/ViewProductAndStockServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/service/impl/ViewProductAndStockServiceImpl.java index fd22268..1170916 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/service/impl/ViewProductAndStockServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/service/impl/ViewProductAndStockServiceImpl.java @@ -9,19 +9,19 @@ import com.ruoyi.out.productAndStock.service.IViewProductAndStockService; /** * 库存物资Service业务层处理 - * + * * @author ruoyi - * @date 2025-09-12 + * @date 2026-01-06 */ @Service -public class ViewProductAndStockServiceImpl implements IViewProductAndStockService +public class ViewProductAndStockServiceImpl implements IViewProductAndStockService { @Autowired private ViewProductAndStockMapper viewProductAndStockMapper; /** * 查询库存物资 - * + * * @param onlyIdentity 库存物资主键 * @return 库存物资 */ @@ -33,7 +33,7 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi /** * 查询库存物资列表 - * + * * @param viewProductAndStock 库存物资 * @return 库存物资 */ @@ -45,7 +45,7 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi /** * 新增库存物资 - * + * * @param viewProductAndStock 库存物资 * @return 结果 */ @@ -57,7 +57,7 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi /** * 修改库存物资 - * + * * @param viewProductAndStock 库存物资 * @return 结果 */ @@ -69,7 +69,7 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi /** * 批量删除库存物资 - * + * * @param onlyIdentitys 需要删除的库存物资主键 * @return 结果 */ @@ -81,7 +81,7 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi /** * 删除库存物资信息 - * + * * @param onlyIdentity 库存物资主键 * @return 结果 */ @@ -90,10 +90,4 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi { return viewProductAndStockMapper.deleteViewProductAndStockByOnlyIdentity(onlyIdentity); } - - @Override - public List selectViewProductAndStockPdList(ViewProductAndStock viewProductAndStock) { - return viewProductAndStockMapper.selectViewProductAndStockPdList(viewProductAndStock); - - } } diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml index a817bac..31db6a8 100644 --- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml @@ -243,8 +243,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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.spare1, d.spare2, d.spare3, d.spare4,d.spare5, d.spare6,d.spare7,d.spare8,d.spare9 + d.product_name,d.spare1, d.spare2, d.spare3, d.spare4,d.spare5, d.spare6,d.spare7,d.spare8,d.spare9 from out_stockout_detail d left join bas_product p on d.product_id = p.product_id where d.stockout_guid = #{stockoutGuid} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/out/ViewProductAndStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/productAndStock/ViewProductAndStockMapper.xml similarity index 58% rename from ruoyi-admin/src/main/resources/mapper/out/ViewProductAndStockMapper.xml rename to ruoyi-admin/src/main/resources/mapper/productAndStock/ViewProductAndStockMapper.xml index 262948d..8b8c786 100644 --- a/ruoyi-admin/src/main/resources/mapper/out/ViewProductAndStockMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/productAndStock/ViewProductAndStockMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -11,84 +11,48 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - - - - - - - select only_identity, product_id, lot_no, product_name, quantity, warehouse_id, spare1, spare3, spare4, spare5, spare6, voltage, power, phase, net_weight, gross_weight, distribution, model, order_id from view_product_and_stock - - - select only_identity, product_id, lot_no, product_name, quantity, warehouse_id, spare1, spare3, spare4, spare5, spare6, voltage, power, phase, net_weight, gross_weight, distribution, model, order_id, spare7 from view_product_and_stock_pd + select only_identity, product_id, lot_no, product_name, quantity, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, voltage, power, phase from view_product_and_stock - + - insert into view_product_and_stock @@ -99,7 +63,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" product_name, quantity, warehouse_id, + stacking_id, spare1, + spare2, spare3, spare4, spare5, @@ -107,11 +73,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" voltage, power, phase, - net_weight, - gross_weight, - distribution, - model, - order_id, #{onlyIdentity}, @@ -120,7 +81,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{productName}, #{quantity}, #{warehouseId}, + #{stackingId}, #{spare1}, + #{spare2}, #{spare3}, #{spare4}, #{spare5}, @@ -128,11 +91,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{voltage}, #{power}, #{phase}, - #{netWeight}, - #{grossWeight}, - #{distribution}, - #{model}, - #{orderId}, @@ -144,7 +102,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" product_name = #{productName}, quantity = #{quantity}, warehouse_id = #{warehouseId}, + stacking_id = #{stackingId}, spare1 = #{spare1}, + spare2 = #{spare2}, spare3 = #{spare3}, spare4 = #{spare4}, spare5 = #{spare5}, @@ -152,11 +112,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" voltage = #{voltage}, power = #{power}, phase = #{phase}, - net_weight = #{netWeight}, - gross_weight = #{grossWeight}, - distribution = #{distribution}, - model = #{model}, - order_id = #{orderId}, where only_identity = #{onlyIdentity} @@ -166,9 +121,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from view_product_and_stock where only_identity in + delete from view_product_and_stock where only_identity in #{onlyIdentity} - + \ No newline at end of file diff --git a/ruoyi-ui/src/views/job/outJobManagement.vue b/ruoyi-ui/src/views/job/outJobManagement.vue index f63ccf8..6dd0716 100644 --- a/ruoyi-ui/src/views/job/outJobManagement.vue +++ b/ruoyi-ui/src/views/job/outJobManagement.vue @@ -141,28 +141,19 @@ - - - - + - + - - - - - - - - + + + + + - - - - - - - - - - - + + + + + + + + + - - + + - - - + + + + + + + + + + - - - - - - - - - - - + - - - + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/stock/pointOut.vue b/ruoyi-ui/src/views/stock/pointOut.vue index 39b20b2..54fa6e5 100644 --- a/ruoyi-ui/src/views/stock/pointOut.vue +++ b/ruoyi-ui/src/views/stock/pointOut.vue @@ -88,27 +88,23 @@ - - + - - - - + + + + + + + + + + + + - - - - - - - - - - - - +