zyr/FT546MWS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

出库管理页面字段修改

Browse Source
This commit is contained in:
liuhanqing
2026-01-07 10:08:57 +08:00
parent 3b8dbc90d0
commit a71caaef81
11 changed files with 242 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/controller/ViewProductAndStockController.java
View File

@@ -25,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
* 库存物资Controller * 库存物资Controller
* *
* @author ruoyi * @author ruoyi
* @date 2025-09-12 * @date 2026-01-06
*/ */
@RestController @RestController
@RequestMapping("/out/productAndStock") @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") @GetMapping("/list")
public TableDataInfo list(ViewProductAndStock viewProductAndStock) public TableDataInfo list(ViewProductAndStock viewProductAndStock)
{ {
@@ -45,22 +45,11 @@ public class ViewProductAndStockController extends BaseController
List<ViewProductAndStock> list = viewProductAndStockService.selectViewProductAndStockList(viewProductAndStock); List<ViewProductAndStock> list = viewProductAndStockService.selectViewProductAndStockList(viewProductAndStock);
return getDataTable(list); return getDataTable(list);
} }
/**
* 查询库存物资列表
*/
@PreAuthorize("@ss.hasPermi('out:productAndStock:list')")
@GetMapping("/pd/list")
public TableDataInfo pdList(ViewProductAndStock viewProductAndStock)
{
startPage();
List<ViewProductAndStock> list = viewProductAndStockService.selectViewProductAndStockPdList(viewProductAndStock);
return getDataTable(list);
}
/** /**
* 导出库存物资列表 * 导出库存物资列表
*/ */
@PreAuthorize("@ss.hasPermi('out:productAndStock:export')") @PreAuthorize("@ss.hasPermi('productAndStock:productAndStock:export')")
@Log(title = "库存物资", businessType = BusinessType.EXPORT) @Log(title = "库存物资", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, ViewProductAndStock viewProductAndStock) 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}") @GetMapping(value = "/{onlyIdentity}")
public AjaxResult getInfo(@PathVariable("onlyIdentity") Long 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) @Log(title = "库存物资", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody ViewProductAndStock viewProductAndStock) 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) @Log(title = "库存物资", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody ViewProductAndStock viewProductAndStock) 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) @Log(title = "库存物资", businessType = BusinessType.DELETE)
@DeleteMapping("/{onlyIdentitys}") @DeleteMapping("/{onlyIdentitys}")
public AjaxResult remove(@PathVariable Long[] onlyIdentitys) public AjaxResult remove(@PathVariable Long[] onlyIdentitys)

230
ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/domain/ViewProductAndStock.java
View File

@@ -1,6 +1,5 @@
package com.ruoyi.out.productAndStock.domain; package com.ruoyi.out.productAndStock.domain;
import java.math.BigDecimal;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
@@ -8,9 +7,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 库存物资对象 view_product_and_stock * 库存物资对象 view_product_and_stock
* *
* @author ruoyi * @author ruoyi
* @date 2025-09-12 * @date 2026-01-06
*/ */
public class ViewProductAndStock extends BaseEntity public class ViewProductAndStock extends BaseEntity
{ {
@@ -20,278 +19,226 @@ public class ViewProductAndStock extends BaseEntity
@Excel(name = "序号") @Excel(name = "序号")
private Long onlyIdentity; private Long onlyIdentity;
/** 品号 */ /** 物料编码 */
@Excel(name = "品号") @Excel(name = "物料编码")
private String productId; private String productId;
/** 批次号 */ /** 批号 */
@Excel(name = "批次号") @Excel(name = "批号")
private String lotNo; private String lotNo;
/** 品名 */ /** 物料名称 */
@Excel(name = "品名") @Excel(name = "物料名称")
private String productName; private String productName;
/** 数量 */ /** 库存数量 */
@Excel(name = "数量") @Excel(name = "库存数量")
private BigDecimal quantity; private String quantity;
/** 仓库 */ /** 仓库编码 */
@Excel(name = "仓库") @Excel(name = "仓库编码")
private String warehouseId; private String warehouseId;
/** 规格 */ /** 供应商名称 */
@Excel(name = "规格") @Excel(name = "供应商名称")
private String stackingId;
/** 层次关系 */
@Excel(name = "层次关系")
private String spare1; private String spare1;
/** 单位 */ /** 上层物料 */
@Excel(name = "单位") @Excel(name = "上层物料")
private String spare2;
/** 顶层物料 */
@Excel(name = "顶层物料")
private String spare3; private String spare3;
/** 型号 */ /** 项目号 */
@Excel(name = "型号") @Excel(name = "项目号")
private String spare4; private String spare4;
/** 颜色 */ /** 合同号 */
@Excel(name = "颜色") @Excel(name = "合同号")
private String spare5; private String spare5;
/** 序列号 */ /** 销售订单号 */
@Excel(name = "序列号") @Excel(name = "销售订单号")
private String spare6; private String spare6;
@Excel(name = "是否盘点")
private String spare7;
/** 电压 */ /** 供应商编码 */
@Excel(name = "电压") @Excel(name = "供应商编码")
private String voltage; private String voltage;
/** 功率 */ /** 规格型号 */
@Excel(name = "功率") @Excel(name = "规格型号")
private String power; private String power;
/** 相位 */ /** 计量单位 */
@Excel(name = "相位") @Excel(name = "计量单位")
private String phase; private String phase;
/** 净重 */ public void setOnlyIdentity(Long onlyIdentity)
@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)
{ {
this.onlyIdentity = onlyIdentity; this.onlyIdentity = onlyIdentity;
} }
public Long getOnlyIdentity() public Long getOnlyIdentity()
{ {
return onlyIdentity; return onlyIdentity;
} }
public void setProductId(String productId) public void setProductId(String productId)
{ {
this.productId = productId; this.productId = productId;
} }
public String getProductId() public String getProductId()
{ {
return productId; return productId;
} }
public void setLotNo(String lotNo) public void setLotNo(String lotNo)
{ {
this.lotNo = lotNo; this.lotNo = lotNo;
} }
public String getLotNo() public String getLotNo()
{ {
return lotNo; return lotNo;
} }
public void setProductName(String productName) public void setProductName(String productName)
{ {
this.productName = productName; this.productName = productName;
} }
public String getProductName() public String getProductName()
{ {
return productName; return productName;
} }
public void setQuantity(BigDecimal quantity) public void setQuantity(String quantity)
{ {
this.quantity = quantity; this.quantity = quantity;
} }
public BigDecimal getQuantity() public String getQuantity()
{ {
return quantity; return quantity;
} }
public void setWarehouseId(String warehouseId) public void setWarehouseId(String warehouseId)
{ {
this.warehouseId = warehouseId; this.warehouseId = warehouseId;
} }
public String getWarehouseId() public String getWarehouseId()
{ {
return warehouseId; 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; this.spare1 = spare1;
} }
public String getSpare1() public String getSpare1()
{ {
return spare1; 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; this.spare3 = spare3;
} }
public String getSpare3() public String getSpare3()
{ {
return spare3; return spare3;
} }
public void setSpare4(String spare4) public void setSpare4(String spare4)
{ {
this.spare4 = spare4; this.spare4 = spare4;
} }
public String getSpare4() public String getSpare4()
{ {
return spare4; return spare4;
} }
public void setSpare5(String spare5) public void setSpare5(String spare5)
{ {
this.spare5 = spare5; this.spare5 = spare5;
} }
public String getSpare5() public String getSpare5()
{ {
return spare5; return spare5;
} }
public void setSpare6(String spare6) public void setSpare6(String spare6)
{ {
this.spare6 = spare6; this.spare6 = spare6;
} }
public String getSpare6() public String getSpare6()
{ {
return spare6; return spare6;
} }
public void setVoltage(String voltage) public void setVoltage(String voltage)
{ {
this.voltage = voltage; this.voltage = voltage;
} }
public String getVoltage() public String getVoltage()
{ {
return voltage; return voltage;
} }
public void setPower(String power) public void setPower(String power)
{ {
this.power = power; this.power = power;
} }
public String getPower() public String getPower()
{ {
return power; return power;
} }
public void setPhase(String phase) public void setPhase(String phase)
{ {
this.phase = phase; this.phase = phase;
} }
public String getPhase() public String getPhase()
{ {
return phase; 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 @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -301,7 +248,9 @@ public class ViewProductAndStock extends BaseEntity
.append("productName", getProductName()) .append("productName", getProductName())
.append("quantity", getQuantity()) .append("quantity", getQuantity())
.append("warehouseId", getWarehouseId()) .append("warehouseId", getWarehouseId())
.append("stackingId", getStackingId())
.append("spare1", getSpare1()) .append("spare1", getSpare1())
.append("spare2", getSpare2())
.append("spare3", getSpare3()) .append("spare3", getSpare3())
.append("spare4", getSpare4()) .append("spare4", getSpare4())
.append("spare5", getSpare5()) .append("spare5", getSpare5())
@@ -309,11 +258,6 @@ public class ViewProductAndStock extends BaseEntity
.append("voltage", getVoltage()) .append("voltage", getVoltage())
.append("power", getPower()) .append("power", getPower())
.append("phase", getPhase()) .append("phase", getPhase())
.append("netWeight", getNetWeight())
.append("grossWeight", getGrossWeight())
.append("distribution", getDistribution())
.append("model", getModel())
.append("orderId", getOrderId())
.toString(); .toString();
} }
} }

20
ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/mapper/ViewProductAndStockMapper.java
View File

@@ -5,15 +5,15 @@ import com.ruoyi.out.productAndStock.domain.ViewProductAndStock;
/** /**
* 库存物资Mapper接口 * 库存物资Mapper接口
* *
* @author ruoyi * @author ruoyi
* @date 2025-09-12 * @date 2026-01-06
*/ */
public interface ViewProductAndStockMapper public interface ViewProductAndStockMapper
{ {
/** /**
* 查询库存物资 * 查询库存物资
* *
* @param onlyIdentity 库存物资主键 * @param onlyIdentity 库存物资主键
* @return 库存物资 * @return 库存物资
*/ */
@@ -21,7 +21,7 @@ public interface ViewProductAndStockMapper
/** /**
* 查询库存物资列表 * 查询库存物资列表
* *
* @param viewProductAndStock 库存物资 * @param viewProductAndStock 库存物资
* @return 库存物资集合 * @return 库存物资集合
*/ */
@@ -29,7 +29,7 @@ public interface ViewProductAndStockMapper
/** /**
* 新增库存物资 * 新增库存物资
* *
* @param viewProductAndStock 库存物资 * @param viewProductAndStock 库存物资
* @return 结果 * @return 结果
*/ */
@@ -37,7 +37,7 @@ public interface ViewProductAndStockMapper
/** /**
* 修改库存物资 * 修改库存物资
* *
* @param viewProductAndStock 库存物资 * @param viewProductAndStock 库存物资
* @return 结果 * @return 结果
*/ */
@@ -45,7 +45,7 @@ public interface ViewProductAndStockMapper
/** /**
* 删除库存物资 * 删除库存物资
* *
* @param onlyIdentity 库存物资主键 * @param onlyIdentity 库存物资主键
* @return 结果 * @return 结果
*/ */
@@ -53,11 +53,9 @@ public interface ViewProductAndStockMapper
/** /**
* 批量删除库存物资 * 批量删除库存物资
* *
* @param onlyIdentitys 需要删除的数据主键集合 * @param onlyIdentitys 需要删除的数据主键集合
* @return 结果 * @return 结果
*/ */
public int deleteViewProductAndStockByOnlyIdentitys(Long[] onlyIdentitys); public int deleteViewProductAndStockByOnlyIdentitys(Long[] onlyIdentitys);
List<ViewProductAndStock> selectViewProductAndStockPdList(ViewProductAndStock viewProductAndStock);
} }

20
ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/service/IViewProductAndStockService.java
View File

@@ -5,15 +5,15 @@ import com.ruoyi.out.productAndStock.domain.ViewProductAndStock;
/** /**
* 库存物资Service接口 * 库存物资Service接口
* *
* @author ruoyi * @author ruoyi
* @date 2025-09-12 * @date 2026-01-06
*/ */
public interface IViewProductAndStockService public interface IViewProductAndStockService
{ {
/** /**
* 查询库存物资 * 查询库存物资
* *
* @param onlyIdentity 库存物资主键 * @param onlyIdentity 库存物资主键
* @return 库存物资 * @return 库存物资
*/ */
@@ -21,7 +21,7 @@ public interface IViewProductAndStockService
/** /**
* 查询库存物资列表 * 查询库存物资列表
* *
* @param viewProductAndStock 库存物资 * @param viewProductAndStock 库存物资
* @return 库存物资集合 * @return 库存物资集合
*/ */
@@ -29,7 +29,7 @@ public interface IViewProductAndStockService
/** /**
* 新增库存物资 * 新增库存物资
* *
* @param viewProductAndStock 库存物资 * @param viewProductAndStock 库存物资
* @return 结果 * @return 结果
*/ */
@@ -37,7 +37,7 @@ public interface IViewProductAndStockService
/** /**
* 修改库存物资 * 修改库存物资
* *
* @param viewProductAndStock 库存物资 * @param viewProductAndStock 库存物资
* @return 结果 * @return 结果
*/ */
@@ -45,7 +45,7 @@ public interface IViewProductAndStockService
/** /**
* 批量删除库存物资 * 批量删除库存物资
* *
* @param onlyIdentitys 需要删除的库存物资主键集合 * @param onlyIdentitys 需要删除的库存物资主键集合
* @return 结果 * @return 结果
*/ */
@@ -53,11 +53,9 @@ public interface IViewProductAndStockService
/** /**
* 删除库存物资信息 * 删除库存物资信息
* *
* @param onlyIdentity 库存物资主键 * @param onlyIdentity 库存物资主键
* @return 结果 * @return 结果
*/ */
public int deleteViewProductAndStockByOnlyIdentity(Long onlyIdentity); public int deleteViewProductAndStockByOnlyIdentity(Long onlyIdentity);
List<ViewProductAndStock> selectViewProductAndStockPdList(ViewProductAndStock viewProductAndStock);
} }

24
ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/service/impl/ViewProductAndStockServiceImpl.java
View File

@@ -9,19 +9,19 @@ import com.ruoyi.out.productAndStock.service.IViewProductAndStockService;
/** /**
* 库存物资Service业务层处理 * 库存物资Service业务层处理
* *
* @author ruoyi * @author ruoyi
* @date 2025-09-12 * @date 2026-01-06
*/ */
@Service @Service
public class ViewProductAndStockServiceImpl implements IViewProductAndStockService public class ViewProductAndStockServiceImpl implements IViewProductAndStockService
{ {
@Autowired @Autowired
private ViewProductAndStockMapper viewProductAndStockMapper; private ViewProductAndStockMapper viewProductAndStockMapper;
/** /**
* 查询库存物资 * 查询库存物资
* *
* @param onlyIdentity 库存物资主键 * @param onlyIdentity 库存物资主键
* @return 库存物资 * @return 库存物资
*/ */
@@ -33,7 +33,7 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi
/** /**
* 查询库存物资列表 * 查询库存物资列表
* *
* @param viewProductAndStock 库存物资 * @param viewProductAndStock 库存物资
* @return 库存物资 * @return 库存物资
*/ */
@@ -45,7 +45,7 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi
/** /**
* 新增库存物资 * 新增库存物资
* *
* @param viewProductAndStock 库存物资 * @param viewProductAndStock 库存物资
* @return 结果 * @return 结果
*/ */
@@ -57,7 +57,7 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi
/** /**
* 修改库存物资 * 修改库存物资
* *
* @param viewProductAndStock 库存物资 * @param viewProductAndStock 库存物资
* @return 结果 * @return 结果
*/ */
@@ -69,7 +69,7 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi
/** /**
* 批量删除库存物资 * 批量删除库存物资
* *
* @param onlyIdentitys 需要删除的库存物资主键 * @param onlyIdentitys 需要删除的库存物资主键
* @return 结果 * @return 结果
*/ */
@@ -81,7 +81,7 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi
/** /**
* 删除库存物资信息 * 删除库存物资信息
* *
* @param onlyIdentity 库存物资主键 * @param onlyIdentity 库存物资主键
* @return 结果 * @return 结果
*/ */
@@ -90,10 +90,4 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi
{ {
return viewProductAndStockMapper.deleteViewProductAndStockByOnlyIdentity(onlyIdentity); return viewProductAndStockMapper.deleteViewProductAndStockByOnlyIdentity(onlyIdentity);
} }
@Override
public List<ViewProductAndStock> selectViewProductAndStockPdList(ViewProductAndStock viewProductAndStock) {
return viewProductAndStockMapper.selectViewProductAndStockPdList(viewProductAndStock);
}
} }

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

@@ -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.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.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.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 from out_stockout_detail d left join bas_product p on d.product_id = p.product_id
where d.stockout_guid = #{stockoutGuid} where d.stockout_guid = #{stockoutGuid}
</select> </select>
</mapper> </mapper>

83
ruoyi-admin/src/main/resources/mapper/out/ViewProductAndStockMapper.xml → ruoyi-admin/src/main/resources/mapper/productAndStock/ViewProductAndStockMapper.xml
View File

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.out.productAndStock.mapper.ViewProductAndStockMapper"> <mapper namespace="com.ruoyi.out.productAndStock.mapper.ViewProductAndStockMapper">
<resultMap type="ViewProductAndStock" id="ViewProductAndStockResult"> <resultMap type="ViewProductAndStock" id="ViewProductAndStockResult">
<result property="onlyIdentity" column="only_identity" /> <result property="onlyIdentity" column="only_identity" />
<result property="productId" column="product_id" /> <result property="productId" column="product_id" />
@@ -11,84 +11,48 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="productName" column="product_name" /> <result property="productName" column="product_name" />
<result property="quantity" column="quantity" /> <result property="quantity" column="quantity" />
<result property="warehouseId" column="warehouse_id" /> <result property="warehouseId" column="warehouse_id" />
<result property="stackingId" column="stacking_id" />
<result property="spare1" column="spare1" /> <result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" /> <result property="spare3" column="spare3" />
<result property="spare4" column="spare4" /> <result property="spare4" column="spare4" />
<result property="spare5" column="spare5" /> <result property="spare5" column="spare5" />
<result property="spare6" column="spare6" /> <result property="spare6" column="spare6" />
<result property="spare7" column="spare7" />
<result property="voltage" column="voltage" /> <result property="voltage" column="voltage" />
<result property="power" column="power" /> <result property="power" column="power" />
<result property="phase" column="phase" /> <result property="phase" column="phase" />
<result property="netWeight" column="net_weight" />
<result property="grossWeight" column="gross_weight" />
<result property="distribution" column="distribution" />
<result property="model" column="model" />
<result property="orderId" column="order_id" />
</resultMap> </resultMap>
<sql id="selectViewProductAndStockVo"> <sql id="selectViewProductAndStockVo">
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, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, voltage, power, phase from view_product_and_stock
</sql>
<sql id="selectViewProductAndStockPdVo">
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
</sql> </sql>
<select id="selectViewProductAndStockList" parameterType="ViewProductAndStock" resultMap="ViewProductAndStockResult"> <select id="selectViewProductAndStockList" parameterType="ViewProductAndStock" resultMap="ViewProductAndStockResult">
<include refid="selectViewProductAndStockVo"/> <include refid="selectViewProductAndStockVo"/>
<where> <where>
<if test="onlyIdentity != null "> and only_identity = #{onlyIdentity}</if> <if test="onlyIdentity != null "> and only_identity = #{onlyIdentity}</if>
<if test="productId != null and productId != ''"> and product_id like concat('%', #{productId}, '%')</if> <if test="productId != null and productId != ''"> and product_id = #{productId}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if> <if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if> <if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="quantity != null "> and quantity = #{quantity}</if> <if test="quantity != null and quantity != ''"> and quantity = #{quantity}</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if> <if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
<if test="stackingId != null and stackingId != ''"> and stacking_id = #{stackingId}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if> <if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if> <if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if> <if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if> <if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and spare6 = #{spare6}</if> <if test="spare6 != null and spare6 != ''"> and spare6 = #{spare6}</if>
<if test="spare7 != null and spare7 != ''"> and spare7 = #{spare7}</if>
<if test="voltage != null and voltage != ''"> and voltage = #{voltage}</if> <if test="voltage != null and voltage != ''"> and voltage = #{voltage}</if>
<if test="power != null and power != ''"> and power = #{power}</if> <if test="power != null and power != ''"> and power = #{power}</if>
<if test="phase != null and phase != ''"> and phase = #{phase}</if> <if test="phase != null and phase != ''"> and phase = #{phase}</if>
<if test="netWeight != null "> and net_weight = #{netWeight}</if>
<if test="grossWeight != null "> and gross_weight = #{grossWeight}</if>
<if test="distribution != null and distribution != ''"> and distribution = #{distribution}</if>
<if test="model != null and model != ''"> and model = #{model}</if>
<if test="orderId != null and orderId != ''"> and order_id = #{orderId}</if>
</where> </where>
</select> </select>
<select id="selectViewProductAndStockByOnlyIdentity" parameterType="Long" resultMap="ViewProductAndStockResult"> <select id="selectViewProductAndStockByOnlyIdentity" parameterType="Long" resultMap="ViewProductAndStockResult">
<include refid="selectViewProductAndStockVo"/> <include refid="selectViewProductAndStockVo"/>
where only_identity = #{onlyIdentity} where only_identity = #{onlyIdentity}
</select> </select>
<select id="selectViewProductAndStockPdList" parameterType="ViewProductAndStock" resultMap="ViewProductAndStockResult">
<include refid="selectViewProductAndStockPdVo"/>
<where>
<if test="onlyIdentity != null ">and only_identity = #{onlyIdentity}</if>
<if test="productId != null and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
<if test="lotNo != null and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="quantity != null ">and quantity = #{quantity}</if>
<if test="warehouseId != null and warehouseId != ''">and warehouse_id = #{warehouseId}</if>
<if test="spare1 != null and spare1 != ''">and spare1 = #{spare1}</if>
<if test="spare3 != null and spare3 != ''">and spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''">and spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''">and spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''">and spare6 = #{spare6}</if>
<if test="spare7 != null and spare7 != ''">and spare7 = #{spare7}</if>
<if test="voltage != null and voltage != ''">and voltage = #{voltage}</if>
<if test="power != null and power != ''">and power = #{power}</if>
<if test="phase != null and phase != ''">and phase = #{phase}</if>
<if test="netWeight != null ">and net_weight = #{netWeight}</if>
<if test="grossWeight != null ">and gross_weight = #{grossWeight}</if>
<if test="distribution != null and distribution != ''">and distribution = #{distribution}</if>
<if test="model != null and model != ''">and model = #{model}</if>
<if test="orderId != null and orderId != ''">and order_id = #{orderId}</if>
</where>
</select>
<insert id="insertViewProductAndStock" parameterType="ViewProductAndStock"> <insert id="insertViewProductAndStock" parameterType="ViewProductAndStock">
insert into view_product_and_stock insert into view_product_and_stock
@@ -99,7 +63,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="productName != null">product_name,</if> <if test="productName != null">product_name,</if>
<if test="quantity != null">quantity,</if> <if test="quantity != null">quantity,</if>
<if test="warehouseId != null">warehouse_id,</if> <if test="warehouseId != null">warehouse_id,</if>
<if test="stackingId != null">stacking_id,</if>
<if test="spare1 != null">spare1,</if> <if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare3 != null">spare3,</if> <if test="spare3 != null">spare3,</if>
<if test="spare4 != null">spare4,</if> <if test="spare4 != null">spare4,</if>
<if test="spare5 != null">spare5,</if> <if test="spare5 != null">spare5,</if>
@@ -107,11 +73,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="voltage != null">voltage,</if> <if test="voltage != null">voltage,</if>
<if test="power != null">power,</if> <if test="power != null">power,</if>
<if test="phase != null">phase,</if> <if test="phase != null">phase,</if>
<if test="netWeight != null">net_weight,</if>
<if test="grossWeight != null">gross_weight,</if>
<if test="distribution != null">distribution,</if>
<if test="model != null">model,</if>
<if test="orderId != null">order_id,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="onlyIdentity != null">#{onlyIdentity},</if> <if test="onlyIdentity != null">#{onlyIdentity},</if>
@@ -120,7 +81,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="productName != null">#{productName},</if> <if test="productName != null">#{productName},</if>
<if test="quantity != null">#{quantity},</if> <if test="quantity != null">#{quantity},</if>
<if test="warehouseId != null">#{warehouseId},</if> <if test="warehouseId != null">#{warehouseId},</if>
<if test="stackingId != null">#{stackingId},</if>
<if test="spare1 != null">#{spare1},</if> <if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare3 != null">#{spare3},</if> <if test="spare3 != null">#{spare3},</if>
<if test="spare4 != null">#{spare4},</if> <if test="spare4 != null">#{spare4},</if>
<if test="spare5 != null">#{spare5},</if> <if test="spare5 != null">#{spare5},</if>
@@ -128,11 +91,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="voltage != null">#{voltage},</if> <if test="voltage != null">#{voltage},</if>
<if test="power != null">#{power},</if> <if test="power != null">#{power},</if>
<if test="phase != null">#{phase},</if> <if test="phase != null">#{phase},</if>
<if test="netWeight != null">#{netWeight},</if>
<if test="grossWeight != null">#{grossWeight},</if>
<if test="distribution != null">#{distribution},</if>
<if test="model != null">#{model},</if>
<if test="orderId != null">#{orderId},</if>
</trim> </trim>
</insert> </insert>
@@ -144,7 +102,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="productName != null">product_name = #{productName},</if> <if test="productName != null">product_name = #{productName},</if>
<if test="quantity != null">quantity = #{quantity},</if> <if test="quantity != null">quantity = #{quantity},</if>
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if> <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
<if test="stackingId != null">stacking_id = #{stackingId},</if>
<if test="spare1 != null">spare1 = #{spare1},</if> <if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare3 != null">spare3 = #{spare3},</if> <if test="spare3 != null">spare3 = #{spare3},</if>
<if test="spare4 != null">spare4 = #{spare4},</if> <if test="spare4 != null">spare4 = #{spare4},</if>
<if test="spare5 != null">spare5 = #{spare5},</if> <if test="spare5 != null">spare5 = #{spare5},</if>
@@ -152,11 +112,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="voltage != null">voltage = #{voltage},</if> <if test="voltage != null">voltage = #{voltage},</if>
<if test="power != null">power = #{power},</if> <if test="power != null">power = #{power},</if>
<if test="phase != null">phase = #{phase},</if> <if test="phase != null">phase = #{phase},</if>
<if test="netWeight != null">net_weight = #{netWeight},</if>
<if test="grossWeight != null">gross_weight = #{grossWeight},</if>
<if test="distribution != null">distribution = #{distribution},</if>
<if test="model != null">model = #{model},</if>
<if test="orderId != null">order_id = #{orderId},</if>
</trim> </trim>
where only_identity = #{onlyIdentity} where only_identity = #{onlyIdentity}
</update> </update>
@@ -166,9 +121,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete> </delete>
<delete id="deleteViewProductAndStockByOnlyIdentitys" parameterType="String"> <delete id="deleteViewProductAndStockByOnlyIdentitys" parameterType="String">
delete from view_product_and_stock where only_identity in delete from view_product_and_stock where only_identity in
<foreach item="onlyIdentity" collection="array" open="(" separator="," close=")"> <foreach item="onlyIdentity" collection="array" open="(" separator="," close=")">
#{onlyIdentity} #{onlyIdentity}
</foreach> </foreach>
</delete> </delete>
</mapper> </mapper>

44
ruoyi-ui/src/views/job/outJobManagement.vue
View File

@@ -141,28 +141,19 @@
<dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/> <dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column :label="$t('outJobManagement.onLineType')" align="left" prop="onLineType"> &lt;!&ndash; 上线类型 &ndash;&gt;
<template slot-scope="scope">
<dict-tag :options="dict.type.on_line_type" :value="scope.row.onLineType"/>
</template>
</el-table-column>-->
<el-table-column label="任务类型" align="left" prop="inOrOut"> <!-- 任务类型 --> <el-table-column label="任务类型" align="left" prop="inOrOut"> <!-- 任务类型 -->
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.out_job_type" :value="scope.row.inOrOut"/> <dict-tag :options="dict.type.out_job_type" :value="scope.row.inOrOut"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="任务号" align="left" prop="taskNo" /> <!-- 任务号 --> <el-table-column label="任务号" align="left" prop="taskNo" /> <!-- 任务号 -->
<!-- <el-table-column :label="$t('outJobManagement.customerId')" align="left" prop="customerId" /> &lt;!&ndash; 客户ID &ndash;&gt;--> <el-table-column label="托盘码" align="left" prop="trayCode" width="130" />
<el-table-column label="序列号" align="left" prop="trayCode" width="130" sortable/>
<el-table-column label="巷道" align="left" prop="roadwayId" sortable/> <!-- 巷道ID -->
<el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="130"/> <!-- 货位ID --> <el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="130"/> <!-- 货位ID -->
<el-table-column label="订单号" align="left" prop="lineId" width="130"/> <!-- 结束时间 --> <el-table-column label="项目号" align="left" prop="lineId" width="130"/> <!-- 结束时间 -->
<el-table-column label="出口" align="left" prop="exitId"/> <!-- 出口ID --> <el-table-column label="出口" align="left" prop="exitId"/> <!-- 出口ID -->
<el-table-column label="创建时间" align="left" prop="createTime" width="180" sortable/> <!-- 创建时间 --> <el-table-column label="创建时间" align="left" prop="createTime" width="180" sortable/> <!-- 创建时间 -->
<el-table-column label="开始时间" align="left" prop="startTime" width="180" sortable/> <!-- 开始时间 --> <el-table-column label="开始时间" align="left" prop="startTime" width="180" sortable/> <!-- 开始时间 -->
<el-table-column label="结束时间" align="left" prop="finishTime" width="180" sortable/> <!-- 结束时间 --> <el-table-column label="结束时间" align="left" prop="finishTime" width="180" sortable/> <!-- 结束时间 -->
<!-- <el-table-column :label="$t('outJobManagement.warehouseId')" align="left" prop="warehouseId" /> &lt;!&ndash; 仓库ID &ndash;&gt;-->
<!-- <el-table-column label="仓库ID" align="left" prop="warehouseName" /> &lt;!&ndash; 仓库ID &ndash;&gt;-->
</el-table> </el-table>
<pagination <pagination
@@ -175,24 +166,21 @@
<el-table v-loading="detailLoading" :data="mydoJobDetailList" @selection-change="handleSelectionChange"> <el-table v-loading="detailLoading" :data="mydoJobDetailList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="子任务ID" align="left" prop="jobDetailId" width="160" /> <!-- 子任务ID --> <el-table-column label="子任务ID" align="left" prop="jobDetailId" width="160" />
<el-table-column label="库存ID" align="left" prop="stockId" width="160" /> <!-- 库存ID --> <el-table-column label="库存ID" align="left" prop="stockId" width="160" />
<el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160" /> <!-- 子单据ID --> <el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160" />
<el-table-column label="品号" align="left" prop="productId" /> <el-table-column label="存货编码" align="left" prop="productId" />
<el-table-column label="品名" align="left" prop="productName" /> <el-table-column label="存货名称" align="left" prop="productName" />
<el-table-column label="出库数量" align="right" prop="outQuantity" /> <!-- 出库数量 -->
<el-table-column label="批次号" align="left" prop="lotNo" /> <el-table-column label="批次号" align="left" prop="lotNo" />
<el-table-column label="机型" align="left" prop="unit"/><!--机型--> <el-table-column label="客户名称" align="left" prop="stackingId"/>
<el-table-column label="分销" align="left" prop="spare9"/><!--分销--> <el-table-column label="层级关系" align="left" prop="spare1"/>
<el-table-column label="规格" align="left" prop="spec"/><!--规格--> <el-table-column label="上层物料" align="left" prop="spare2"/>
<el-table-column label="型号" align="left" prop="spare1"/><!--型号--> <el-table-column label="顶层物料" align="left" prop="spare3"/>
<el-table-column label="净重" align="left" prop="spare2"/><!--净重--> <el-table-column label="项目号" align="left" prop="spare4"/>
<el-table-column label="颜色" align="left" prop="spare3"/><!--颜色--> <el-table-column label="合同号" align="left" prop="spare5"/>
<el-table-column label="序列号" align="left" prop="spare4"/><!--序列号--> <el-table-column label="销售订单" align="left" prop="spare6"/>
<el-table-column label="电压" align="left" prop="spare5"/><!--电压--> <el-table-column label="出库数量" align="right" prop="outQuantity" />
<el-table-column label="功率" align="left" prop="spare6"/><!--功率-->
<el-table-column label="相位" align="left" prop="spare7"/><!--相位-->
<el-table-column label="毛重" align="left" prop="spare8"/><!--毛重-->
</el-table> </el-table>
<pagination <pagination

99
ruoyi-ui/src/views/out/addOutStockout.vue
View File

@@ -45,28 +45,25 @@
<!-- 物资明细表格 --> <!-- 物资明细表格 -->
<el-table v-loading="loading" :data="materialList"> <el-table v-loading="loading" :data="materialList">
<el-table-column label="品号" align="center" prop="productId" /><!--物资编号--> <el-table-column label="存货编码" align="center" prop="productId" /><!--物资编号-->
<el-table-column label="品名" align="center" prop="productName" /><!--品名--> <el-table-column label="存货名称" align="center" prop="productName" /><!--品名-->
<el-table-column label="批次号" align="center" prop="lotNo" /> <el-table-column label="批次号" align="center" prop="lotNo" />
<el-table-column label="订单号" align="center" prop="orderId" /> <el-table-column label="仓库编码" align="center" prop="warehouse_id" />
<el-table-column label="序列号" align="center" prop="printDate" /> <el-table-column label="层次关系" align="center" prop="spare1" />
<!-- <el-table-column :label="$t('addOutStockout.batchNo')" align="left" prop="lotNo" />&lt;!&ndash;批号&ndash;&gt;--> <el-table-column label="上层物料" align="center" prop="spare2" />
<el-table-column label="顶层物料" align="center" prop="spare3" />
<el-table-column label="项目号" align="center" prop="spare4" />
<el-table-column label="合同号" align="center" prop="spare5" />
<el-table-column label="销售订单号" align="center" prop="spare6" />
<el-table-column label="供应商编码" align="center" prop="fid" />
<el-table-column label="规格型号" align="center" prop="spec" />
<el-table-column label="计量单位" align="center" prop="unit" />
<el-table-column :label="'数量'" align="center" prop="quantity" width="150"><!--数量--> <el-table-column :label="'数量'" align="center" prop="quantity" width="150"><!--数量-->
<template slot-scope="scope"> <template slot-scope="scope">
<el-input-number v-model="scope.row.quantity" :min="1" size="mini" @change="handleQuantityChange(scope.row)" /> <el-input-number v-model="scope.row.quantity" :min="1" size="mini" @change="handleQuantityChange(scope.row)" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="规格" align="center" prop="spec" />
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="型号" align="center" prop="cargoNo" />
<el-table-column label="颜色" align="center" prop="price" />
<el-table-column label="电压" align="center" prop="voltage" />
<el-table-column label="功率" align="center" prop="power" />
<el-table-column label="相位" align="center" prop="phase" />
<el-table-column label="净重" align="center" prop="netWeight" />
<el-table-column label="毛重" align="center" prop="grossWeight" />
<el-table-column label="分销" align="center" prop="distribution" />
<el-table-column label="机型" align="center" prop="model" />
<el-table-column :label="'操作'" align="center" class-name="small-padding fixed-width"><!--操作--> <el-table-column :label="'操作'" align="center" class-name="small-padding fixed-width"><!--操作-->
<template slot-scope="scope"> <template slot-scope="scope">
@@ -79,18 +76,18 @@
<el-dialog :title="'选择物资'" :visible.sync="materialDialog" width="800px" append-to-body><!--选择物资--> <el-dialog :title="'选择物资'" :visible.sync="materialDialog" width="800px" append-to-body><!--选择物资-->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="品号" prop="productId"><!--品号--> <el-form-item label="存货编码" prop="productId"><!--品号-->
<el-input <el-input
v-model="queryParams.productId" v-model="queryParams.productId"
:placeholder="'请输入品号'" :placeholder="'请输入存货编码'"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="品名" prop="productName"><!--品名--> <el-form-item label="存货名称" prop="productName"><!--品名-->
<el-input <el-input
v-model="queryParams.productName" v-model="queryParams.productName"
:placeholder="'请输入品名'" :placeholder="'请输入存货名称'"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
@@ -115,11 +112,11 @@
clearable clearable
@keyup.enter.native="handleQuery"/> @keyup.enter.native="handleQuery"/>
</el-form-item>--> </el-form-item>-->
<el-form-item label="订单号" prop="orderId"> <!-- <el-form-item label="订单号" prop="orderId">
<el-input v-model="queryParams.orderId" placeholder="请输入订单号" <el-input v-model="queryParams.orderId" placeholder="请输入订单号"
clearable clearable
@keyup.enter.native="handleQuery"/> @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>-->
<el-form-item> <el-form-item>
@@ -131,24 +128,21 @@
<el-table v-loading="materialLoading" :data="materialOptions" @selection-change="handleSelectionChange"> <el-table v-loading="materialLoading" :data="materialOptions" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" prop="onlyIdentity" /> <el-table-column label="序号" align="center" prop="onlyIdentity" />
<el-table-column label="订单号" align="center" prop="orderId" /> <el-table-column label="存货编码" align="center" prop="productId" />
<el-table-column label="品号" align="center" prop="productId" /> <el-table-column label="批号" align="center" prop="lotNo" />
<el-table-column label="批次号" align="center" prop="lotNo" /> <el-table-column label="存货名称" align="center" prop="productName" />
<el-table-column label="品名" align="center" prop="productName" /> <el-table-column label="库存数量" align="center" prop="quantity" />
<el-table-column label="数量" align="center" prop="quantity" /> <el-table-column label="仓库编码" align="center" prop="warehouseId" />
<!-- <el-table-column label="仓库" align="center" prop="warehouseId" />--> <el-table-column label="供应商名称" align="center" prop="stackingId" />
<el-table-column label="规格" align="center" prop="spare1" /> <el-table-column label="层次关系" align="center" prop="spare1" />
<el-table-column label="单位" align="center" prop="spare3" /> <el-table-column label="上层物料" align="center" prop="spare2" />
<el-table-column label="型号" align="center" prop="spare4" /> <el-table-column label="顶层物料" align="center" prop="spare3" />
<el-table-column label="颜色" align="center" prop="spare5" /> <el-table-column label="项目号" align="center" prop="spare4" />
<el-table-column label="序列号" align="center" prop="spare6" /> <el-table-column label="合同号" align="center" prop="spare5" />
<el-table-column label="电压" align="center" prop="voltage" /> <el-table-column label="销售订单号" align="center" prop="spare6" />
<el-table-column label="功率" align="center" prop="power" /> <el-table-column label="供应商编码" align="center" prop="voltage" />
<el-table-column label="相位" align="center" prop="phase" /> <el-table-column label="规格型号" align="center" prop="power" />
<el-table-column label="净重" align="center" prop="netWeight" /> <el-table-column label="计量单位" align="center" prop="phase" />
<el-table-column label="毛重" align="center" prop="grossWeight" />
<el-table-column label="分销" align="center" prop="distribution" />
<el-table-column label="机型" align="center" prop="model" />
</el-table> </el-table>
<pagination <pagination
@@ -411,22 +405,17 @@ export default {
productName: item.productName, productName: item.productName,
quantity: item.quantity, quantity: item.quantity,
quantityOrignal: item.quantity, quantityOrignal: item.quantity,
voltage: item.voltage, fid: item.voltage,
phase: item.phase, unit: item.phase,
power: item.power, spec: item.power,
netWeight: item.netWeight,
grossWeight: item.grossWeight,
distribution: item.distribution,
model: item.model,
orderId: item.orderId,
unit: item.spare3,
spec: item.spare1,
cargoNo: item.spare4,
printDate:item.spare6,
price:item.spare5,
warehouseId: item.warehouseId,
lotNo: item.lotNo, lotNo: item.lotNo,
onlyIdentity: item.onlyIdentity warehouseId: item.warehouseId,
spare1: item.spare1,
spare2: item.spare2,
spare3: item.spare3,
spare4: item.spare4,
spare5: item.spare5,
spare6: item.spare6,
})) }))
); );
this.materialDialog = false; this.materialDialog = false;

50
ruoyi-ui/src/views/out/outStockoutManage.vue
View File

@@ -146,14 +146,20 @@
<dict-tag :options="dict.type.out_bill_status" :value="scope.row.status"/> <dict-tag :options="dict.type.out_bill_status" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="'出口'" align="left" prop="exitId" sortable/> <!-- <el-table-column :label="'出口'" align="left" prop="exitId" sortable/>-->
<!-- <el-table-column :label="'客户编码'" align="left" prop="customerNo" />--> <el-table-column :label="'项目号'" align="left" prop="departmentNo" />
<el-table-column :label="'客户名称'" align="left" prop="customerName" width="200"/> <el-table-column :label="'客户编码'" align="left" prop="customerNo" />
<el-table-column :label="'客户编码'" align="left" prop="classNowId" />
<el-table-column :label="'建单人'" align="left" prop="createManId" /> <el-table-column :label="'建单人'" align="left" prop="createManId" />
<!-- <el-table-column :label="'仓库'" align="left" prop="warehouseId" />-->
<el-table-column :label="'合同号'" align="left" prop="spare1" />
<el-table-column :label="'销售订单号'" align="left" prop="spare2" />
<el-table-column :label="'审核时间'" align="left" prop="spare3" />
<el-table-column :label="'审核人'" align="left" prop="spare4" />
<el-table-column :label="'创建时间'" align="left" prop="createDate" width="160" sortable/> <el-table-column :label="'创建时间'" align="left" prop="createDate" width="160" sortable/>
<el-table-column :label="'开始时间'" align="left" prop="startDate" width="160" sortable/> <el-table-column :label="'开始时间'" align="left" prop="startDate" width="160" sortable/>
<el-table-column :label="'确认时间'" align="left" prop="finishDate" width="160" sortable/> <el-table-column :label="'确认时间'" align="left" prop="finishDate" width="160" sortable/>
<!-- <el-table-column :label="'仓库名称'" align="left" prop="warehouseName" />--> <el-table-column :label="'备注'" align="left" prop="spare5" />
</el-table> </el-table>
<pagination <pagination
@@ -168,26 +174,22 @@
<el-table v-loading="detailLoading" :data="outStockDetailList" style="margin-top: 20px;" @selection-change="handleDetailSelectionChange"> <el-table v-loading="detailLoading" :data="outStockDetailList" style="margin-top: 20px;" @selection-change="handleDetailSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column :label="'出库子单编号'" align="center" prop="stockoutDetailId" width="160" /> <!-- 出库子单编号 --> <el-table-column :label="'出库子单编号'" align="center" prop="stockoutDetailId" width="160" /> <!-- 出库子单编号 -->
<el-table-column :label="'品号'" align="center" prop="productId" sortable/> <!-- 品号 --> <el-table-column :label="'存货编码'" align="center" prop="productId" sortable/>
<el-table-column :label="'品名'" align="center" prop="productName" /> <el-table-column :label="'存货名称'" align="center" prop="productName" />
<el-table-column :label="'批次号'" align="center" prop="lotNo"/><!--英文描述--> <el-table-column :label="'批次号'" align="center" prop="lotNo"/>
<el-table-column :label="'序列号'" align="center" prop="printDate"/> <!--序列号--> <el-table-column :label="'供应商编码'" align="center" prop="fid"/>
<el-table-column label="订单号" align="center" prop="orderId" width="160" /> <el-table-column :label="'计量单位'" align="center" prop="unit"/>
<el-table-column :label="'计划数量'" align="center" prop="quantity" /> <!-- 计划数量 --> <el-table-column :label="'规格型号'" align="center" prop="spec"/>
<el-table-column :label="'分配数量'" align="center" prop="allotQuantity" /> <!-- 分配数量 --> <el-table-column :label="'层次关系'" align="center" prop="spare1"/>
<el-table-column :label="'实际数量'" align="center" prop="assignNum" /> <!-- 实际数量 --> <el-table-column :label="'上层物料'" align="center" prop="spare2"/>
<el-table-column :label="'颜色'" align="center" prop="price"/><!--箱号--> <el-table-column :label="'顶层物料'" align="center" prop="spare3"/>
<el-table-column :label="'单位'" align="center" prop="unit"/><!--单位--> <el-table-column :label="'项目号'" align="center" prop="spare4"/>
<el-table-column :label="'规格'" align="center" prop="spec" /> <!--规格--> <el-table-column :label="'合同号'" align="center" prop="spare5"/>
<el-table-column :label="'型号'" align="center" prop="cargoNo" /> <!--型号--> <el-table-column :label="'销售订单'" align="center" prop="spare6"/>
<el-table-column label="电压" align="center" prop="voltage" /> <el-table-column :label="'出库数量'" align="center" prop="quantity"/>
<el-table-column label="功率" align="center" prop="power" /> <el-table-column :label="'分配数量'" align="center" prop="allotQuantity"/>
<el-table-column label="相位" align="center" prop="phase" /> <el-table-column :label="'实际数量'" align="center" prop="assignNum"/>
<el-table-column label="净重" align="center" prop="netWeight" /> <el-table-column :label="'备注'" align="center" prop="remark"/>
<el-table-column label="毛重" align="center" prop="grossWeight" />
<el-table-column label="分销" align="center" prop="distribution" />
<el-table-column label="机型" align="center" prop="model" />
<el-table-column :label="'备注'" align="center" prop="remark" /> <!-- 备注 -->
</el-table> </el-table>
<!-- <pagination--> <!-- <pagination-->

32
ruoyi-ui/src/views/stock/pointOut.vue
View File

@@ -88,27 +88,23 @@
<el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange" max-height="650"> <el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange" max-height="650">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="库存编码" align="center" prop="stockId" width="120"/> <el-table-column label="库存编码" align="center" prop="stockId" width="120"/>
<el-table-column label="巷道" align="center" prop="roadwayId" sortable/>
<el-table-column label="货位名称" align="center" prop="cargoSpaceName" width="120"/> <el-table-column label="货位名称" align="center" prop="cargoSpaceName" width="120"/>
<el-table-column label="入库日期" align="center" prop="inDate" width="160" sortable/> <el-table-column label="入库日期" align="center" prop="inDate" width="160" />
<el-table-column label="批次号" align="center" prop="lotNo"/> <el-table-column label="批次号" align="center" prop="lotNo"/>
<el-table-column label="订单号" align="center" prop="orderId" width="160" sortable/> <el-table-column label="托盘条码" align="center" prop="trayCode" width="130" />
<el-table-column label="序列号" align="center" prop="trayCode" width="130" sortable/> <el-table-column label="存货编码" align="center" prop="productId" />
<el-table-column label="品号" align="center" prop="productId" sortable/> <el-table-column label="存货名称" align="center" prop="productName"/>
<el-table-column label="品名" align="center" prop="productName"/> <el-table-column label="层级关系" align="center" prop="spare1"/>
<el-table-column label="上层物料" align="center" prop="spare2"/>
<el-table-column label="顶层物料" align="center" prop="spare3"/>
<el-table-column label="项目号" align="center" prop="spare4"/>
<el-table-column label="合同号" align="center" prop="spare5"/>
<el-table-column label="销售订单" align="center" prop="spare6"/>
<el-table-column label="供应商编码" align="center" prop="voltage"/>
<el-table-column label="规格型号" align="center" prop="power"/>
<el-table-column label="计量单位" align="center" prop="phase"/>
<el-table-column label="数量" align="center" prop="quantity"/> <el-table-column label="数量" align="center" prop="quantity"/>
<el-table-column label="规格" align="center" prop="spare1"/>
<el-table-column label="单位" align="center" prop="spare3"/>
<el-table-column label="型号" align="center" prop="spare4"/>
<el-table-column label="颜色" align="center" prop="spare5"/>
<el-table-column label="序列号" align="center" prop="spare6"/>
<el-table-column label="电压" align="center" prop="voltage"/>
<el-table-column label="功率" align="center" prop="power"/>
<el-table-column label="相位" align="center" prop="phase"/>
<el-table-column label="净重" align="center" prop="netWeight"/>
<el-table-column label="毛重" align="center" prop="grossWeight"/>
<el-table-column label="分销" align="center" prop="distribution"/>
<el-table-column label="机型" align="center" prop="model"/>
</el-table> </el-table>