lhq/FT501-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改入库管理 盘点管理联查

Browse Source
This commit is contained in:
liuhanqing
2025-06-10 10:50:24 +08:00
parent be72a0ac13
commit a87bc77cf3
30 changed files with 561 additions and 545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

197
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/domain/CheckStockin.java
View File

@@ -1,5 +1,8 @@
package com.ruoyi.check.stockcheck.domain;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -7,10 +10,13 @@ import com.ruoyi.common.core.domain.BaseEntity;
/**
* 盘库单据主信息对象 check_stockin
*
*
* @author ruoyi
* @date 2025-05-29
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class CheckStockin extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -41,6 +47,7 @@ public class CheckStockin extends BaseEntity
/** 仓库ID */
@Excel(name = "仓库ID")
private String warehouseId;
private String warehouseName;
/** 完成日期 */
@Excel(name = " 完成日期")
@@ -90,195 +97,7 @@ public class CheckStockin extends BaseEntity
@Excel(name = "备用字段5")
private String spare5;
public void setStockGuid(String stockGuid)
{
this.stockGuid = stockGuid;
}
public String getStockGuid()
{
return stockGuid;
}
public void setStockCheckId(String stockCheckId)
{
this.stockCheckId = stockCheckId;
}
public String getStockCheckId()
{
return stockCheckId;
}
public void setCheckType(String checkType)
{
this.checkType = checkType;
}
public String getCheckType()
{
return checkType;
}
public void setCreateDate(String createDate)
{
this.createDate = createDate;
}
public String getCreateDate()
{
return createDate;
}
public void setCreateManId(String createManId)
{
this.createManId = createManId;
}
public String getCreateManId()
{
return createManId;
}
public void setStatus(String status)
{
this.status = status;
}
public String getStatus()
{
return status;
}
public void setWarehouseId(String warehouseId)
{
this.warehouseId = warehouseId;
}
public String getWarehouseId()
{
return warehouseId;
}
public void setFinishDate(String finishDate)
{
this.finishDate = finishDate;
}
public String getFinishDate()
{
return finishDate;
}
public void setErpBill(String erpBill)
{
this.erpBill = erpBill;
}
public String getErpBill()
{
return erpBill;
}
public void setStockSource(String stockSource)
{
this.stockSource = stockSource;
}
public String getStockSource()
{
return stockSource;
}
public void setDepartmentNo(String departmentNo)
{
this.departmentNo = departmentNo;
}
public String getDepartmentNo()
{
return departmentNo;
}
public void setCustomerNo(String customerNo)
{
this.customerNo = customerNo;
}
public String getCustomerNo()
{
return customerNo;
}
public void setClassNo(String classNo)
{
this.classNo = classNo;
}
public String getClassNo()
{
return classNo;
}
public void setSupplierNo(String supplierNo)
{
this.supplierNo = supplierNo;
}
public String getSupplierNo()
{
return supplierNo;
}
public void setSpare1(String spare1)
{
this.spare1 = spare1;
}
public String getSpare1()
{
return spare1;
}
public void setSpare2(String spare2)
{
this.spare2 = spare2;
}
public String getSpare2()
{
return spare2;
}
public void setSpare3(String spare3)
{
this.spare3 = spare3;
}
public String getSpare3()
{
return spare3;
}
public void setSpare4(String spare4)
{
this.spare4 = spare4;
}
public String getSpare4()
{
return spare4;
}
public void setSpare5(String spare5)
{
this.spare5 = spare5;
}
public String getSpare5()
{
return spare5;
}
@Override
public String toString() {

9
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java
View File

@@ -6,6 +6,7 @@ import java.util.Date;
import java.util.List;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.IdUtil;
import com.ruoyi.bas.BasProduct.domain.BasProduct;
import com.ruoyi.bas.BasProduct.service.IBasProductService;
@@ -14,6 +15,7 @@ import com.ruoyi.check.stockcheck.domain.CheckStockVo;
import com.ruoyi.check.stockcheckdetail.domain.CheckStockinDetail;
import com.ruoyi.check.stockcheckdetail.service.ICheckStockinDetailService;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.UUID;
import com.ruoyi.in.stockin.domain.InStockin;
import com.ruoyi.in.stockindetail.domain.InStockinDetail;
@@ -127,6 +129,7 @@ public class CheckStockinServiceImpl implements ICheckStockinService
}
private void insertCheckStockinHistory(CheckStockin checkStockin) {
checkStockin = selectCheckStockinByStockGuid(checkStockin.getStockGuid());
//插入历史单据
checkStockinMapper.insertCheckStockinHistory(checkStockin);
checkStockinDetailService.insertCheckStockinDetailHistory(checkStockin);
@@ -163,12 +166,12 @@ public class CheckStockinServiceImpl implements ICheckStockinService
public String saveBill(CheckStockVo checkStockVo) {
CheckStockin checkStockin = checkStockVo.getCheckStockin();
List<CheckStockinDetail> detailList = checkStockVo.getDetailList();
String stockCheckId = basJobIdService.getJobId("CKD");
String stockCheckId = basJobIdService.getJobId("PDD");
checkStockin.setStockCheckId(stockCheckId);
checkStockin.setStockGuid(IdUtil.simpleUUID());
checkStockin.setCreateDate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
String username = SecurityContextHolder.getContext().getAuthentication().getName();
checkStockin.setCreateManId(username);
checkStockin.setCreateManId(SecurityUtils.getUsername());
checkStockin.setDepartmentNo(Convert.toStr(SecurityUtils.getDeptId()));
checkStockin.setStatus("1");
checkStockin.setStockSource("0");
checkStockin.setCheckType(checkStockin.getCheckType());

6
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/service/impl/CheckStockinDetailServiceImpl.java
View File

@@ -45,11 +45,7 @@ public class CheckStockinDetailServiceImpl implements ICheckStockinDetailService
@Override
public List<CheckStockinDetail> selectCheckStockinDetailList(CheckStockinDetail checkStockinDetail)
{
List<CheckStockinDetail> checkStockinDetails = checkStockinDetailMapper.selectCheckStockinDetailList(checkStockinDetail);
for (CheckStockinDetail stockinDetail : checkStockinDetails) {
stockinDetail.setExtraField(JSONUtil.toBean(stockinDetail.getSpare1(), ExtraField.class));
}
return checkStockinDetails;
return checkStockinDetailMapper.selectCheckStockinDetailList(checkStockinDetail);
}
/**

6
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/service/impl/CheckStockinDetailFinishServiceImpl.java
View File

@@ -97,10 +97,6 @@ public class CheckStockinDetailFinishServiceImpl implements ICheckStockinDetailF
@Override
public List<CheckStockinDetail> selectCheckStockinDetailList(CheckStockinDetail checkStockinDetail) {
List<CheckStockinDetail> checkStockinDetails = checkStockinDetailFinishMapper.selectCheckStockinDetailList(checkStockinDetail);
for (CheckStockinDetail stockinDetail : checkStockinDetails) {
stockinDetail.setExtraField(JSONUtil.toBean(stockinDetail.getSpare1(), ExtraField.class));
}
return checkStockinDetails;
return checkStockinDetailFinishMapper.selectCheckStockinDetailList(checkStockinDetail);
}
}

1
ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java
View File

@@ -116,6 +116,7 @@ public class InStockinServiceImpl implements IInStockinService
* @param inStockin
*/
private void insertInStockinHistory(InStockin inStockin) {
inStockin = selectInStockinByStockinGuid(inStockin.getStockinGuid());
//插入历史单据
inStockinMapper.insertInStockinHistory(inStockin);
iInStockinDetailService.insertInStockinDetailHistory(inStockin);

7
ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java
View File

@@ -46,11 +46,10 @@ public class InStockinDetailServiceImpl implements IInStockinDetailService
@Override
public List<InStockinDetail> selectInStockinDetailList(InStockinDetail inStockinDetail)
{
List<InStockinDetail> inStockinDetails = inStockinDetailMapper.selectInStockinDetailList(inStockinDetail);
for (InStockinDetail res : inStockinDetails) {
/*for (InStockinDetail res : inStockinDetails) {
res.setExtraField(JSONUtil.toBean(res.getSpare1(), ExtraField.class));
}
return inStockinDetails;
}*/
return inStockinDetailMapper.selectInStockinDetailList(inStockinDetail);
}
/**

7
ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/impl/InStockinDetailFinishServiceImpl.java
View File

@@ -97,11 +97,8 @@ public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishS
@Override
public List<InStockinDetail> selectInStockinDetailList(InStockinDetail inStockinDetail) {
List<InStockinDetail> inStockinDetails = inStockinDetailFinishMapper.selectInStockinDetailFinishListByInStockinDetail(inStockinDetail);
for (InStockinDetail res : inStockinDetails) {
res.setExtraField(JSONUtil.toBean(res.getSpare1(), ExtraField.class));
}
return inStockinDetails;
return inStockinDetailFinishMapper.selectInStockinDetailFinishListByInStockinDetail(inStockinDetail);
}
}

4
ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/impl/MydoJobDetailServiceImpl.java
View File

@@ -46,11 +46,11 @@ public class MydoJobDetailServiceImpl implements IMydoJobDetailService
public List<MydoJobDetail> selectMydoJobDetailList(MydoJobDetail mydoJobDetail)
{
List<MydoJobDetail> mydoJobDetails = mydoJobDetailMapper.selectMydoJobDetailList(mydoJobDetail);
for (MydoJobDetail jobDetail : mydoJobDetails) {
/*for (MydoJobDetail jobDetail : mydoJobDetails) {
if (StrUtil.isNotEmpty(jobDetail.getSpare1())){
jobDetail.setExtraField(JSONUtil.toBean(jobDetail.getSpare1(), ExtraField.class));
}
}
}*/
return mydoJobDetails;
}

4
ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/service/impl/MydoJobDetailFinishServiceImpl.java
View File

@@ -54,11 +54,11 @@ public class MydoJobDetailFinishServiceImpl implements IMydoJobDetailFinishServi
String jobId = mydoJobDetail.getJobId();
List<MydoJobDetail> mydoJobDetails = mydoJobDetailFinishMapper.selectMydoJobDetailFinishListByJobId(jobId);
for (MydoJobDetail jobDetail : mydoJobDetails) {
/*for (MydoJobDetail jobDetail : mydoJobDetails) {
if (StrUtil.isNotEmpty(jobDetail.getSpare1())){
jobDetail.setExtraField(JSONUtil.toBean(jobDetail.getSpare1(), ExtraField.class));
}
}
}*/
return mydoJobDetails;
}

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

@@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
/**
* 可出库的库存物资信息对象 view_product_and_stock
*
*
* @author ruoyi
* @date 2025-05-21
*/
@@ -38,63 +38,72 @@ public class ViewProductAndStock extends BaseEntity
/** 仓库 */
@Excel(name = "仓库")
private String warehouseId;
private String warehouseName;
public void setOnlyIdentity(Long onlyIdentity)
public String getWarehouseName() {
return warehouseName;
}
public void setWarehouseName(String warehouseName) {
this.warehouseName = warehouseName;
}
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(String quantity)
public void setQuantity(String quantity)
{
this.quantity = quantity;
}
public String 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;
}

6
ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/service/impl/ReceiveStockinDetailServiceImpl.java
View File

@@ -48,11 +48,7 @@ public class ReceiveStockinDetailServiceImpl implements IReceiveStockinDetailSer
@Override
public List<ReceiveStockinDetail> selectReceiveStockinDetailList(ReceiveStockinDetail receiveStockinDetail)
{
List<ReceiveStockinDetail> receiveStockinDetails = receiveStockinDetailMapper.selectReceiveStockinDetailList(receiveStockinDetail);
for (ReceiveStockinDetail stockinDetail : receiveStockinDetails) {
stockinDetail.setExtraField(JSONUtil.toBean(stockinDetail.getSpare1(), ExtraField.class));
}
return receiveStockinDetails;
return receiveStockinDetailMapper.selectReceiveStockinDetailList(receiveStockinDetail);
}
/**

7
ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/impl/ReceiveStockinDetailFinishServiceImpl.java
View File

@@ -98,10 +98,7 @@ public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDet
@Override
public List<ReceiveStockinDetail> selectReceiveStockinDetailList(ReceiveStockinDetail receiveStockinDetail) {
List<ReceiveStockinDetail> receiveStockinDetails = receiveStockinDetailFinishMapper.selectReceiveStockinDetailList(receiveStockinDetail);
for (ReceiveStockinDetail res : receiveStockinDetails) {
res.setExtraField(JSONUtil.toBean(res.getSpare1(), ExtraField.class));
}
return receiveStockinDetails;
return receiveStockinDetailFinishMapper.selectReceiveStockinDetailList(receiveStockinDetail);
}
}

75
ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailFinishMapper.xml
View File

@@ -67,10 +67,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<association property="extraField" javaType="ExtraField">
<result property="productId" column="product_id" />
<result property="materialDesc" column="product_name" />
<result property="englishDesc" column="englishDesc" />
<result property="length" column="length" />
<result property="width" column="width" />
<result property="height" column="height" />
<result property="volume" column="volume" />
<result property="netWeight" column="netWeight" />
</association>
</resultMap>
<sql id="selectCheckStockinDetailVo">
select stock_check_detail_id, stock_check_guid, stock_check_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, scan_num, scan_num_x, scan_num_j, spare1, spare2, spare3, spare4, spare5, spare6 from check_stockin_detail_finish
select csd.stock_check_detail_id, csd.stock_check_guid, csd.stock_check_id, csd.lot_no, csd.product_guid, csd.product_id,
csd.quantity, csd.quantity_x, csd.quantity_j, csd.price, csd.cargo_no, csd.remark, csd.assign_num, csd.assign_num_x,
csd.assign_num_j, csd.print_date, csd.stock_status, csd.supplier_id, csd.customer_id, csd.unit, csd.spec,
csd.scan_num, csd.scan_num_x, csd.scan_num_j, csd.spare1, csd.spare2, csd.spare3, csd.spare4,csd.spare5, csd.spare6,
bp.product_name,bp.spare1 as englishDesc,
bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume
from check_stockin_detail_finish csd
left join bas_product bp on csd.product_id = bp.product_id
</sql>
<sql id="selectCheckStockinDetailFinishVo">
@@ -119,34 +136,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
resultMap="CheckStockinDetailResult">
<include refid="selectCheckStockinDetailVo"/>
<where>
<if test="stockCheckGuid != null and stockCheckGuid != ''"> and stock_check_guid = #{stockCheckGuid}</if>
<if test="stockCheckId != null and stockCheckId != ''"> and stock_check_id = #{stockCheckId}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
<if test="spec != null and spec != ''"> and spec = #{spec}</if>
<if test="scanNum != null and scanNum != ''"> and scan_num = #{scanNum}</if>
<if test="scanNumX != null and scanNumX != ''"> and scan_num_x = #{scanNumX}</if>
<if test="scanNumJ != null and scanNumJ != ''"> and scan_num_j = #{scanNumJ}</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="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="stockCheckGuid != null and stockCheckGuid != ''"> and csd.stock_check_guid = #{stockCheckGuid}</if>
<if test="stockCheckId != null and stockCheckId != ''"> and csd.stock_check_id = #{stockCheckId}</if>
<if test="lotNo != null and lotNo != ''"> and csd.lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and csd.product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and csd.product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and csd.quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and csd.quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and csd.quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and csd.price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and csd.cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and csd.assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and csd.assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and csd.assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and csd.print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and csd.stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and csd.supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and csd.customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and csd.unit = #{unit}</if>
<if test="spec != null and spec != ''"> and csd.spec = #{spec}</if>
<if test="scanNum != null and scanNum != ''"> and csd.scan_num = #{scanNum}</if>
<if test="scanNumX != null and scanNumX != ''"> and csd.scan_num_x = #{scanNumX}</if>
<if test="scanNumJ != null and scanNumJ != ''"> and csd.scan_num_j = #{scanNumJ}</if>
<if test="spare1 != null and spare1 != ''"> and csd.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and csd.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and csd.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and csd.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and csd.spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and csd.spare6 = #{spare6}</if>
</where>
</select>

75
ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml
View File

@@ -35,43 +35,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<association property="extraField" javaType="ExtraField">
<result property="productId" column="product_id" />
<result property="materialDesc" column="product_name" />
<result property="englishDesc" column="englishDesc" />
<result property="length" column="length" />
<result property="width" column="width" />
<result property="height" column="height" />
<result property="volume" column="volume" />
<result property="netWeight" column="netWeight" />
</association>
</resultMap>
<sql id="selectCheckStockinDetailVo">
select stock_check_detail_id, stock_check_guid, stock_check_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, scan_num, scan_num_x, scan_num_j, spare1, spare2, spare3, spare4, spare5, spare6 from check_stockin_detail
select csd.stock_check_detail_id, csd.stock_check_guid, csd.stock_check_id, csd.lot_no, csd.product_guid, csd.product_id,
csd.quantity, csd.quantity_x, csd.quantity_j, csd.price, csd.cargo_no, csd.remark, csd.assign_num, csd.assign_num_x,
csd.assign_num_j, csd.print_date, csd.stock_status, csd.supplier_id, csd.customer_id, csd.unit, csd.spec,
csd.scan_num, csd.scan_num_x, csd.scan_num_j, csd.spare1, csd.spare2, csd.spare3, csd.spare4,csd.spare5, csd.spare6,
bp.product_name,bp.spare1 as englishDesc,
bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume
from check_stockin_detail csd
left join bas_product bp on csd.product_id = bp.product_id
</sql>
<select id="selectCheckStockinDetailList" parameterType="CheckStockinDetail" resultMap="CheckStockinDetailResult">
<include refid="selectCheckStockinDetailVo"/>
<where>
<if test="stockCheckGuid != null and stockCheckGuid != ''"> and stock_check_guid = #{stockCheckGuid}</if>
<if test="stockCheckId != null and stockCheckId != ''"> and stock_check_id = #{stockCheckId}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
<if test="spec != null and spec != ''"> and spec = #{spec}</if>
<if test="scanNum != null and scanNum != ''"> and scan_num = #{scanNum}</if>
<if test="scanNumX != null and scanNumX != ''"> and scan_num_x = #{scanNumX}</if>
<if test="scanNumJ != null and scanNumJ != ''"> and scan_num_j = #{scanNumJ}</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="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="stockCheckGuid != null and stockCheckGuid != ''"> and csd.stock_check_guid = #{stockCheckGuid}</if>
<if test="stockCheckId != null and stockCheckId != ''"> and csd.stock_check_id = #{stockCheckId}</if>
<if test="lotNo != null and lotNo != ''"> and csd.lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and csd.product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and csd.product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and csd.quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and csd.quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and csd.quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and csd.price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and csd.cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and csd.assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and csd.assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and csd.assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and csd.print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and csd.stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and csd.supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and csd.customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and csd.unit = #{unit}</if>
<if test="spec != null and spec != ''"> and csd.spec = #{spec}</if>
<if test="scanNum != null and scanNum != ''"> and csd.scan_num = #{scanNum}</if>
<if test="scanNumX != null and scanNumX != ''"> and csd.scan_num_x = #{scanNumX}</if>
<if test="scanNumJ != null and scanNumJ != ''"> and csd.scan_num_j = #{scanNumJ}</if>
<if test="spare1 != null and spare1 != ''"> and csd.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and csd.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and csd.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and csd.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and csd.spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and csd.spare6 = #{spare6}</if>
</where>
</select>

7
ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml
View File

@@ -45,9 +45,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="warehouseName" column="warehouse_name" />
</resultMap>
<sql id="selectCheckStockinVo">
select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, warehouse_id, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5 from check_stockin_finish
select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, csf.warehouse_id,warehouse_name, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5
from check_stockin_finish csf
left join bas_warehouse bw on bw.warehouse_id= csf.warehouse_id
</sql>
<sql id="selectCheckStockinFinishVo">
select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, warehouse_id, spare5, spare4, spare3, finish_date, spare2, spare1, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no from check_stockin_finish
@@ -89,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createDate != null and createDate != ''"> and create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
<if test="warehouseId != null and warehouseId != ''"> and csf.warehouse_id = #{warehouseId}</if>
<if test="finishDate != null and finishDate != ''"> and finish_date = #{finishDate}</if>
<if test="erpBill != null and erpBill != ''"> and erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and stock_source = #{stockSource}</if>

8
ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml
View File

@@ -24,10 +24,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="warehouseName" column="warehouse_name" />
</resultMap>
<sql id="selectCheckStockinVo">
select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, warehouse_id, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5 from check_stockin
select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, cs.warehouse_id, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5 ,
bw.warehouse_name
from check_stockin cs
left join bas_warehouse bw on cs.warehouse_id = bw.warehouse_id
</sql>
<select id="selectCheckStockinList" parameterType="CheckStockin" resultMap="CheckStockinResult">
@@ -38,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createDate != null and createDate != ''"> and create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
<if test="warehouseId != null and warehouseId != ''"> and cs.warehouse_id = #{warehouseId}</if>
<if test="finishDate != null and finishDate != ''"> and finish_date = #{finishDate}</if>
<if test="erpBill != null and erpBill != ''"> and erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and stock_source = #{stockSource}</if>

133
ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml
View File

@@ -67,42 +67,61 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="scanNum" column="scan_num" />
<result property="scanNumX" column="scan_num_x" />
<result property="scanNumJ" column="scan_num_j" />
<association property="extraField" javaType="ExtraField">
<result property="productId" column="product_id" />
<result property="materialDesc" column="product_name" />
<result property="englishDesc" column="englishDesc" />
<result property="length" column="length" />
<result property="width" column="width" />
<result property="height" column="height" />
<result property="volume" column="volume" />
<result property="netWeight" column="netWeight" />
</association>
</resultMap>
<sql id="selectInStockinDetailFinishVo">
select stockin_detail_id, stockin_guid, stockin_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, spare1, spare2, spare3, spare4, spare5, spare6, scan_num, scan_num_x, scan_num_j from in_stockin_detail_finish
select
isd.stockin_detail_id, isd.stockin_guid, isd.stockin_id, isd.lot_no, isd.product_guid,
isd.product_id, isd.quantity, isd.quantity_x, isd.quantity_j, isd.price, isd.cargo_no, isd.remark,
isd.assign_num, isd.assign_num_x, isd.assign_num_j, isd.print_date, isd.stock_status,
isd.supplier_id, isd.customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4,
isd.spare5, isd.spare6, isd.scan_num, isd.scan_num_x, isd.scan_num_j,
bp.product_name, bp.spare1 as englishDesc,
bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume
from in_stockin_detail_finish isd
left join bas_product bp on bp.product_id = isd.product_id
</sql>
<select id="selectInStockinDetailFinishList" parameterType="InStockinDetailFinish" resultMap="InStockinDetailFinishResult">
<include refid="selectInStockinDetailFinishVo"/>
<where>
<if test="stockinGuid != null and stockinGuid != ''"> and stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
<if test="spec != null and spec != ''"> and spec = #{spec}</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="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="scanNum != null and scanNum != ''"> and scan_num = #{scanNum}</if>
<if test="scanNumX != null and scanNumX != ''"> and scan_num_x = #{scanNumX}</if>
<if test="scanNumJ != null and scanNumJ != ''"> and scan_num_j = #{scanNumJ}</if>
<if test="stockinGuid != null and stockinGuid != ''"> and isd.stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and isd.stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and isd.lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and isd.product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and isd.product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and isd.quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and isd.quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and isd.quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and isd.price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and isd.cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and isd.assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and isd.assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and isd.assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and isd.print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and isd.stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and isd.supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and isd.customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and isd.unit = #{unit}</if>
<if test="spec != null and spec != ''"> and isd.spec = #{spec}</if>
<if test="spare1 != null and spare1 != ''"> and isd.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and isd.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and isd.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and isd.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and isd.spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and isd.spare6 = #{spare6}</if>
<if test="scanNum != null and scanNum != ''"> and isd.scan_num = #{scanNum}</if>
<if test="scanNumX != null and scanNumX != ''"> and isd.scan_num_x = #{scanNumX}</if>
<if test="scanNumJ != null and scanNumJ != ''"> and isd.scan_num_j = #{scanNumJ}</if>
</where>
</select>
@@ -114,34 +133,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
resultMap="InStockinDetailResult">
<include refid="selectInStockinDetailFinishVo"/>
<where>
<if test="stockinGuid != null and stockinGuid != ''"> and stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
<if test="spec != null and spec != ''"> and spec = #{spec}</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="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="scanNum != null and scanNum != ''"> and scan_num = #{scanNum}</if>
<if test="scanNumX != null and scanNumX != ''"> and scan_num_x = #{scanNumX}</if>
<if test="scanNumJ != null and scanNumJ != ''"> and scan_num_j = #{scanNumJ}</if>
<if test="stockinGuid != null and stockinGuid != ''"> and isd.stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and isd.stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and isd.lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and isd.product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and isd.product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and isd.quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and isd.quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and isd.quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and isd.price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and isd.cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and isd.assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and isd.assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and isd.assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and isd.print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and isd.stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and isd.supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and isd.customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and isd.unit = #{unit}</if>
<if test="spec != null and spec != ''"> and isd.spec = #{spec}</if>
<if test="spare1 != null and spare1 != ''"> and isd.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and isd.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and isd.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and isd.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and isd.spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and isd.spare6 = #{spare6}</if>
<if test="scanNum != null and scanNum != ''"> and isd.scan_num = #{scanNum}</if>
<if test="scanNumX != null and scanNumX != ''"> and isd.scan_num_x = #{scanNumX}</if>
<if test="scanNumJ != null and scanNumJ != ''"> and isd.scan_num_j = #{scanNumJ}</if>
</where>
</select>

79
ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml
View File

@@ -35,14 +35,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="scanNum" column="scan_num" />
<result property="scanNumX" column="scan_num_x" />
<result property="scanNumJ" column="scan_num_j" />
<association property="extraField" javaType="ExtraField">
<result property="productId" column="product_id" />
<result property="materialDesc" column="product_name" />
<result property="englishDesc" column="englishDesc" />
<result property="length" column="length" />
<result property="width" column="width" />
<result property="height" column="height" />
<result property="volume" column="volume" />
<result property="netWeight" column="netWeight" />
</association>
</resultMap>
<sql id="selectInStockinDetailVo">
select stockin_detail_id, stockin_guid, stockin_id, lot_no, isd.product_guid,
isd.product_id, quantity, quantity_x, quantity_j, isd.price, isd.cargo_no, isd.remark,
assign_num, assign_num_x, assign_num_j, print_date, stock_status,
supplier_id, customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4,
isd.spare5, isd.spare6, scan_num, scan_num_x, scan_num_j
select
isd.stockin_detail_id, isd.stockin_guid, isd.stockin_id, isd.lot_no, isd.product_guid,
isd.product_id, isd.quantity, isd.quantity_x, isd.quantity_j, isd.price, isd.cargo_no, isd.remark,
isd.assign_num, isd.assign_num_x, isd.assign_num_j, isd.print_date, isd.stock_status,
isd.supplier_id, isd.customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4,
isd.spare5, isd.spare6, isd.scan_num, isd.scan_num_x, isd.scan_num_j,
bp.product_name, bp.spare1 as englishDesc,
bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume
from in_stockin_detail isd
left join bas_product bp on bp.product_id = isd.product_id
</sql>
@@ -50,34 +63,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectInStockinDetailList" parameterType="InStockinDetail" resultMap="InStockinDetailResult">
<include refid="selectInStockinDetailVo"/>
<where>
<if test="stockinGuid != null and stockinGuid != ''"> and isd.stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and isd.stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and isd.lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and isd.product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and isd.product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and isd.quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and isd.quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and isd.quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and isd.price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and isd.cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and isd.assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and isd.assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and isd.assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and isd.print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and isd.stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and isd.supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and isd.customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and isd.unit = #{unit}</if>
<if test="spec != null and spec != ''"> and isd.spec = #{spec}</if>
<if test="spare1 != null and spare1 != ''"> and isd.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and isd.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and isd.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and isd.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and isd.spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and isd.spare6 = #{spare6}</if>
<if test="scanNum != null and scanNum != ''"> and isd.scan_num = #{scanNum}</if>
<if test="scanNumX != null and scanNumX != ''"> and isd.scan_num_x = #{scanNumX}</if>
<if test="scanNumJ != null and scanNumJ != ''"> and isd.scan_num_j = #{scanNumJ}</if>
<if test="stockinGuid != null and stockinGuid != ''"> and isd.stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and isd.stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and isd.lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and isd.product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and isd.product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and isd.quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and isd.quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and isd.quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and isd.price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and isd.cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and isd.assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and isd.assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and isd.assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and isd.print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and isd.stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and isd.supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and isd.customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and isd.unit = #{unit}</if>
<if test="spec != null and spec != ''"> and isd.spec = #{spec}</if>
<if test="spare1 != null and spare1 != ''"> and isd.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and isd.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and isd.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and isd.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and isd.spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and isd.spare6 = #{spare6}</if>
<if test="scanNum != null and scanNum != ''"> and isd.scan_num = #{scanNum}</if>
<if test="scanNumX != null and scanNumX != ''"> and isd.scan_num_x = #{scanNumX}</if>
<if test="scanNumJ != null and scanNumJ != ''"> and isd.scan_num_j = #{scanNumJ}</if>
</where>
</select>

108
ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml
View File

@@ -3,8 +3,8 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.job.mydojobdetailfinish.mapper.MydoJobDetailFinishMapper">
<resultMap type="MydoJobDetailFinish" id="MydoJobDetailFinishResult">
<resultMap type="MydoJobDetail" id="MydoJobDetailFinishResult">
<result property="jobDetailId" column="job_detail_id" />
<result property="jobId" column="job_id" />
<result property="stockId" column="stock_id" />
@@ -31,41 +31,81 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
<association property="extraField" javaType="ExtraField">
<result property="productId" column="product_id" />
<result property="materialDesc" column="product_name" />
<result property="englishDesc" column="englishDesc" />
<result property="length" column="length" />
<result property="width" column="width" />
<result property="height" column="height" />
<result property="volume" column="volume" />
<result property="netWeight" column="netWeight" />
</association>
</resultMap>
<sql id="selectMydoJobDetailFinishVo">
select job_detail_id, job_id, stock_id, lot_no, in_date, in_or_out_id, in_or_out_d_id, product_guid, product_id, stock_status, in_quantity, stock_quantity, out_quantity, layer_quantity, out_layer_quantity, give_num, stockin_id, stacking_id, exit_id, print_date, customer_id, supplier_id, spare1, spare2, spare3, spare4 from mydo_job_detail_finish
</sql>
select mjd.job_detail_id,
mjd.job_id,
mjd.stock_id,
mjd.lot_no,
mjd.in_date,
mjd.in_or_out_id,
mjd.in_or_out_d_id,
mjd.product_guid,
mjd.product_id,
mjd.stock_status,
mjd.in_quantity,
mjd.stock_quantity,
mjd.out_quantity,
mjd.layer_quantity,
mjd.out_layer_quantity,
mjd.give_num,
mjd.stockin_id,
mjd.stacking_id,
mjd.exit_id,
mjd.print_date,
mjd.customer_id,
mjd.supplier_id,
mjd.spare1,
mjd.spare2,
mjd.spare3,
mjd.spare4,
bp.product_name, bp.spare1 as englishDesc,
bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume
from mydo_job_detail_finish mjd
left join bas_product bp on mjd.product_id = bp.product_id
</sql>
<select id="selectMydoJobDetailFinishList" parameterType="MydoJobDetailFinish" resultMap="MydoJobDetailFinishResult">
<include refid="selectMydoJobDetailFinishVo"/>
<where>
<if test="jobDetailId != null and jobDetailId != ''"> and job_detail_id = #{jobDetailId}</if>
<if test="jobId != null and jobId != ''"> and job_id = #{jobId}</if>
<if test="stockId != null and stockId != ''"> and stock_id = #{stockId}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
<if test="inDate != null and inDate != ''"> and in_date = #{inDate}</if>
<if test="inOrOutId != null and inOrOutId != ''"> and in_or_out_id = #{inOrOutId}</if>
<if test="inOrOutDId != null and inOrOutDId != ''"> and in_or_out_d_id = #{inOrOutDId}</if>
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status = #{stockStatus}</if>
<if test="inQuantity != null and inQuantity != ''"> and in_quantity = #{inQuantity}</if>
<if test="stockQuantity != null and stockQuantity != ''"> and stock_quantity = #{stockQuantity}</if>
<if test="outQuantity != null and outQuantity != ''"> and out_quantity = #{outQuantity}</if>
<if test="layerQuantity != null and layerQuantity != ''"> and layer_quantity = #{layerQuantity}</if>
<if test="outLayerQuantity != null and outLayerQuantity != ''"> and out_layer_quantity = #{outLayerQuantity}</if>
<if test="giveNum != null and giveNum != ''"> and give_num = #{giveNum}</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="stackingId != null and stackingId != ''"> and stacking_id = #{stackingId}</if>
<if test="exitId != null and exitId != ''"> and exit_id = #{exitId}</if>
<if test="printDate != null and printDate != ''"> and print_date = #{printDate}</if>
<if test="customerId != null and customerId != ''"> and customer_id = #{customerId}</if>
<if test="supplierId != null and supplierId != ''"> and supplier_id = #{supplierId}</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="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<where>
<if test="jobDetailId != null and jobDetailId != ''"> and mjd.job_detail_id = #{jobDetailId}</if>
<if test="jobId != null and jobId != ''"> and mjd.job_id = #{jobId}</if>
<if test="stockId != null and stockId != ''"> and mjd.stock_id = #{stockId}</if>
<if test="lotNo != null and lotNo != ''"> and mjd.lot_no = #{lotNo}</if>
<if test="inDate != null and inDate != ''"> and mjd.in_date = #{inDate}</if>
<if test="inOrOutId != null and inOrOutId != ''"> and mjd.in_or_out_id = #{inOrOutId}</if>
<if test="inOrOutDId != null and inOrOutDId != ''"> and mjd.in_or_out_d_id = #{inOrOutDId}</if>
<if test="productGuid != null and productGuid != ''"> and mjd.product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and mjd.product_id = #{productId}</if>
<if test="stockStatus != null and stockStatus != ''"> and mjd.stock_status = #{stockStatus}</if>
<if test="inQuantity != null and inQuantity != ''"> and mjd.in_quantity = #{inQuantity}</if>
<if test="stockQuantity != null and stockQuantity != ''"> and mjd.stock_quantity = #{stockQuantity}</if>
<if test="outQuantity != null and outQuantity != ''"> and mjd.out_quantity = #{outQuantity}</if>
<if test="layerQuantity != null and layerQuantity != ''"> and mjd.layer_quantity = #{layerQuantity}</if>
<if test="outLayerQuantity != null and outLayerQuantity != ''"> and mjd.out_layer_quantity = #{outLayerQuantity}</if>
<if test="giveNum != null and giveNum != ''"> and mjd.give_num = #{giveNum}</if>
<if test="stockinId != null and stockinId != ''"> and mjd.stockin_id = #{stockinId}</if>
<if test="stackingId != null and stackingId != ''"> and mjd.stacking_id = #{stackingId}</if>
<if test="exitId != null and exitId != ''"> and mjd.exit_id = #{exitId}</if>
<if test="printDate != null and printDate != ''"> and mjd.print_date = #{printDate}</if>
<if test="customerId != null and customerId != ''"> and mjd.customer_id = #{customerId}</if>
<if test="supplierId != null and supplierId != ''"> and mjd.supplier_id = #{supplierId}</if>
<if test="spare1 != null and spare1 != ''"> and mjd.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and mjd.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and mjd.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and mjd.spare4 = #{spare4}</if>
</where>
</select>
@@ -73,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectMydoJobDetailFinishVo"/>
where job_id = #{jobId}
</select>
<select id="selectMydoJobDetailFinishByJobDetailId" parameterType="String" resultMap="MydoJobDetailFinishResult">
<include refid="selectMydoJobDetailFinishVo"/>
where job_detail_id = #{jobDetailId}
@@ -176,9 +216,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteMydoJobDetailFinishByJobDetailIds" parameterType="String">
delete from mydo_job_detail_finish where job_detail_id in
delete from mydo_job_detail_finish where job_detail_id in
<foreach item="jobDetailId" collection="array" open="(" separator="," close=")">
#{jobDetailId}
</foreach>
</delete>
</mapper>
</mapper>

97
ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml
View File

@@ -31,42 +31,85 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
<association property="extraField" javaType="ExtraField">
<result property="productId" column="product_id" />
<result property="materialDesc" column="product_name" />
<result property="englishDesc" column="englishDesc" />
<result property="length" column="length" />
<result property="width" column="width" />
<result property="height" column="height" />
<result property="volume" column="volume" />
<result property="netWeight" column="netWeight" />
</association>
</resultMap>
<sql id="selectMydoJobDetailVo">
select job_detail_id, job_id, stock_id, lot_no, in_date, in_or_out_id, in_or_out_d_id, product_guid, product_id, stock_status, in_quantity, stock_quantity, out_quantity, layer_quantity, out_layer_quantity, give_num, stockin_id, stacking_id, exit_id, print_date, customer_id, supplier_id, spare1, spare2, spare3, spare4 from mydo_job_detail
select mjd.job_detail_id,
mjd.job_id,
mjd.stock_id,
mjd.lot_no,
mjd.in_date,
mjd.in_or_out_id,
mjd.in_or_out_d_id,
mjd.product_guid,
mjd.product_id,
mjd.stock_status,
mjd.in_quantity,
mjd.stock_quantity,
mjd.out_quantity,
mjd.layer_quantity,
mjd.out_layer_quantity,
mjd.give_num,
mjd.stockin_id,
mjd.stacking_id,
mjd.exit_id,
mjd.print_date,
mjd.customer_id,
mjd.supplier_id,
mjd.spare1,
mjd.spare2,
mjd.spare3,
mjd.spare4,
bp.product_name, bp.spare1 as englishDesc,
bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume
from mydo_job_detail mjd
left join bas_product bp on mjd.product_id = bp.product_id
</sql>
<select id="selectMydoJobDetailList" parameterType="MydoJobDetail" resultMap="MydoJobDetailResult">
<include refid="selectMydoJobDetailVo"/>
<where>
<if test="jobDetailId != null and jobDetailId != ''"> and job_detail_id = #{jobDetailId}</if>
<if test="jobId != null and jobId != ''"> and job_id = #{jobId}</if>
<if test="stockId != null and stockId != ''"> and stock_id = #{stockId}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
<if test="inDate != null and inDate != ''"> and in_date = #{inDate}</if>
<if test="inOrOutId != null and inOrOutId != ''"> and in_or_out_id = #{inOrOutId}</if>
<if test="inOrOutDId != null and inOrOutDId != ''"> and in_or_out_d_id = #{inOrOutDId}</if>
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status = #{stockStatus}</if>
<if test="inQuantity != null and inQuantity != ''"> and in_quantity = #{inQuantity}</if>
<if test="stockQuantity != null and stockQuantity != ''"> and stock_quantity = #{stockQuantity}</if>
<if test="outQuantity != null and outQuantity != ''"> and out_quantity = #{outQuantity}</if>
<if test="layerQuantity != null and layerQuantity != ''"> and layer_quantity = #{layerQuantity}</if>
<if test="outLayerQuantity != null and outLayerQuantity != ''"> and out_layer_quantity = #{outLayerQuantity}</if>
<if test="giveNum != null and giveNum != ''"> and give_num = #{giveNum}</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="stackingId != null and stackingId != ''"> and stacking_id = #{stackingId}</if>
<if test="exitId != null and exitId != ''"> and exit_id = #{exitId}</if>
<if test="printDate != null and printDate != ''"> and print_date = #{printDate}</if>
<if test="customerId != null and customerId != ''"> and customer_id = #{customerId}</if>
<if test="supplierId != null and supplierId != ''"> and supplier_id = #{supplierId}</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="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<if test="jobDetailId != null and jobDetailId != ''"> and mjd.job_detail_id = #{jobDetailId}</if>
<if test="jobId != null and jobId != ''"> and mjd.job_id = #{jobId}</if>
<if test="stockId != null and stockId != ''"> and mjd.stock_id = #{stockId}</if>
<if test="lotNo != null and lotNo != ''"> and mjd.lot_no = #{lotNo}</if>
<if test="inDate != null and inDate != ''"> and mjd.in_date = #{inDate}</if>
<if test="inOrOutId != null and inOrOutId != ''"> and mjd.in_or_out_id = #{inOrOutId}</if>
<if test="inOrOutDId != null and inOrOutDId != ''"> and mjd.in_or_out_d_id = #{inOrOutDId}</if>
<if test="productGuid != null and productGuid != ''"> and mjd.product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and mjd.product_id = #{productId}</if>
<if test="stockStatus != null and stockStatus != ''"> and mjd.stock_status = #{stockStatus}</if>
<if test="inQuantity != null and inQuantity != ''"> and mjd.in_quantity = #{inQuantity}</if>
<if test="stockQuantity != null and stockQuantity != ''"> and mjd.stock_quantity = #{stockQuantity}</if>
<if test="outQuantity != null and outQuantity != ''"> and mjd.out_quantity = #{outQuantity}</if>
<if test="layerQuantity != null and layerQuantity != ''"> and mjd.layer_quantity = #{layerQuantity}</if>
<if test="outLayerQuantity != null and outLayerQuantity != ''"> and mjd.out_layer_quantity = #{outLayerQuantity}</if>
<if test="giveNum != null and giveNum != ''"> and mjd.give_num = #{giveNum}</if>
<if test="stockinId != null and stockinId != ''"> and mjd.stockin_id = #{stockinId}</if>
<if test="stackingId != null and stackingId != ''"> and mjd.stacking_id = #{stackingId}</if>
<if test="exitId != null and exitId != ''"> and mjd.exit_id = #{exitId}</if>
<if test="printDate != null and printDate != ''"> and mjd.print_date = #{printDate}</if>
<if test="customerId != null and customerId != ''"> and mjd.customer_id = #{customerId}</if>
<if test="supplierId != null and supplierId != ''"> and mjd.supplier_id = #{supplierId}</if>
<if test="spare1 != null and spare1 != ''"> and mjd.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and mjd.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and mjd.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and mjd.spare4 = #{spare4}</if>
</where>
</select>
<select id="selectMydoJobDetailByJobDetailId" parameterType="String" resultMap="MydoJobDetailResult">

13
ruoyi-admin/src/main/resources/mapper/out/ViewProductAndStockMapper.xml
View File

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.out.productAndStock.mapper.ViewProductAndStockMapper">
<resultMap type="ViewProductAndStock" id="ViewProductAndStockResult">
<result property="onlyIdentity" column="only_identity" />
<result property="productId" column="product_id" />
@@ -11,15 +11,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="productName" column="product_name" />
<result property="quantity" column="quantity" />
<result property="warehouseId" column="warehouse_id" />
<result property="warehouseName" column="warehouse_name" />
</resultMap>
<sql id="selectViewProductAndStockVo">
select only_identity, product_id, lot_no, product_name, quantity, warehouse_id from view_product_and_stock
select only_identity, product_id, lot_no, product_name, quantity, warehouse_id,warehouse_name from view_product_and_stock
</sql>
<select id="selectViewProductAndStockList" parameterType="ViewProductAndStock" resultMap="ViewProductAndStockResult">
<include refid="selectViewProductAndStockVo"/>
<where>
<where>
<if test="onlyIdentity != null "> and only_identity = #{onlyIdentity}</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>
@@ -28,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
</where>
</select>
<select id="selectViewProductAndStockByOnlyIdentity" parameterType="Long" resultMap="ViewProductAndStockResult">
<include refid="selectViewProductAndStockVo"/>
where only_identity = #{onlyIdentity}
@@ -71,9 +72,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<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=")">
#{onlyIdentity}
</foreach>
</delete>
</mapper>
</mapper>

69
ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailFinishMapper.xml
View File

@@ -61,40 +61,57 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<association property="extraField" javaType="ExtraField">
<result property="productId" column="product_id" />
<result property="materialDesc" column="product_name" />
<result property="englishDesc" column="englishDesc" />
<result property="length" column="length" />
<result property="width" column="width" />
<result property="height" column="height" />
<result property="volume" column="volume" />
<result property="netWeight" column="netWeight" />
</association>
</resultMap>
<sql id="selectReceiveStockinDetailFinishVo">
select stockin_detail_id, stockin_guid, stockin_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, spare1, spare2, spare3, spare4, spare5, spare6 from receive_stockin_detail_finish
select rsd.stockin_detail_id, rsd.stockin_guid, rsd.stockin_id, rsd.lot_no, rsd.product_guid, rsd.product_id,
rsd.quantity, rsd.quantity_x, rsd.quantity_j, rsd.price, rsd.cargo_no, rsd.remark, rsd.assign_num,
rsd.assign_num_x, rsd.assign_num_j, rsd.print_date, rsd.stock_status, rsd.supplier_id, rsd.customer_id,
rsd.unit, rsd.spec, rsd.spare1, rsd.spare2, rsd.spare3, rsd.spare4, rsd.spare5, rsd.spare6,
bp.product_name,bp.spare1 as englishDesc,
bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume
from receive_stockin_detail_finish rsd
left join bas_product bp on rsd.product_id = bp.product_id
</sql>
<select id="selectReceiveStockinDetailFinishList" parameterType="ReceiveStockinDetailFinish" resultMap="ReceiveStockinDetailFinishResult">
<include refid="selectReceiveStockinDetailFinishVo"/>
<where>
<if test="stockinGuid != null and stockinGuid != ''"> and stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
<if test="spec != null and spec != ''"> and spec = #{spec}</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="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="stockinGuid != null and stockinGuid != ''"> and rsd.stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and rsd.stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and rsd.lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and rsd.product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and rsd.product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and rsd.quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and rsd.quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and rsd.quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and rsd.price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and rsd.cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and rsd.assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and rsd.assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and rsd.assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and rsd.print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and rsd.stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and rsd.supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and rsd.customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and rsd.unit = #{unit}</if>
<if test="spec != null and spec != ''"> and rsd.spec = #{spec}</if>
<if test="spare1 != null and spare1 != ''"> and rsd.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and rsd.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and rsd.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and rsd.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and rsd.spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and rsd.spare6 = #{spare6}</if>
</where>
</select>

70
ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailMapper.xml
View File

@@ -32,41 +32,59 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<association property="extraField" javaType="ExtraField">
<result property="productId" column="product_id" />
<result property="materialDesc" column="product_name" />
<result property="englishDesc" column="englishDesc" />
<result property="length" column="length" />
<result property="width" column="width" />
<result property="height" column="height" />
<result property="volume" column="volume" />
<result property="netWeight" column="netWeight" />
</association>
</resultMap>
<sql id="selectReceiveStockinDetailVo">
select stockin_detail_id, stockin_guid, stockin_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, spare1, spare2, spare3, spare4, spare5, spare6 from receive_stockin_detail
select rsd.stockin_detail_id, rsd.stockin_guid, rsd.stockin_id, rsd.lot_no, rsd.product_guid, rsd.product_id,
rsd.quantity, rsd.quantity_x, rsd.quantity_j, rsd.price, rsd.cargo_no, rsd.remark, rsd.assign_num,
rsd.assign_num_x, rsd.assign_num_j, rsd.print_date, rsd.stock_status, rsd.supplier_id, rsd.customer_id,
rsd.unit, rsd.spec, rsd.spare1, rsd.spare2, rsd.spare3, rsd.spare4, rsd.spare5, rsd.spare6,
bp.product_name,bp.spare1 as englishDesc,
bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume
from receive_stockin_detail rsd
left join bas_product bp on rsd.product_id = bp.product_id
</sql>
<select id="selectReceiveStockinDetailList" parameterType="ReceiveStockinDetail" resultMap="ReceiveStockinDetailResult">
<include refid="selectReceiveStockinDetailVo"/>
<where>
<if test="stockinGuid != null and stockinGuid != ''"> and stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
<if test="spec != null and spec != ''"> and spec = #{spec}</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="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="stockinGuid != null and stockinGuid != ''"> and rsd.stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and rsd.stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and rsd.lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and rsd.product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and rsd.product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and rsd.quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and rsd.quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and rsd.quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and rsd.price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and rsd.cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and rsd.assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and rsd.assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and rsd.assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and rsd.print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and rsd.stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and rsd.supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and rsd.customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and rsd.unit = #{unit}</if>
<if test="spec != null and spec != ''"> and rsd.spec = #{spec}</if>
<if test="spare1 != null and spare1 != ''"> and rsd.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and rsd.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and rsd.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and rsd.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and rsd.spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and rsd.spare6 = #{spare6}</if>
</where>
</select>
<select id="selectReceiveStockinDetailByStockinDetailId" parameterType="String" resultMap="ReceiveStockinDetailResult">

3
ruoyi-ui/src/lang/en.js
View File

@@ -354,7 +354,8 @@ export default {
selectMaterialRequired: 'Please select material',
materialExistWarning: 'Selected material already exists, please reselect',
quantityExceedError: 'Quantity cannot exceed stock quantity',
saveSuccess: 'Document {msg} saved successfully'
saveSuccess: 'Document {msg} saved successfully',
lotNo:'lotNo',
},
//***************盘点单据管理***************
checkStockCheck: {

11
ruoyi-ui/src/lang/zh.js
View File

@@ -119,7 +119,7 @@ export default {
stockStatus: '单据状态',
operate: '操作',
netWeight: '净重',
totalPrice: '确定',
totalPrice: '总价格',
totalNetWeight: '总净重',
grossWeight: '毛重',
},
@@ -358,7 +358,8 @@ export default {
selectMaterialRequired: '请选择物资',
materialExistWarning: '所选物资已存在，请重新选择',
quantityExceedError: '数量不能大于库存数量',
saveSuccess: '单据{msg}保存成功'
saveSuccess: '单据{msg}保存成功',
lotNo:'批次号',
},
//***************盘点单据管理***************
checkStockCheck: {
@@ -375,7 +376,7 @@ export default {
invalidate: '单据作废',
review: '单据审核',
confirm: '单据确认',
warehouseId: '仓库ID',
warehouseId: '仓库',
stockSource: '单据来源',
departmentNo: '部门编码',
createManId: '创建人',
@@ -1882,12 +1883,12 @@ export default {
Property: '属性',
Value: '值',
RAM: '内存',
cores: '核心数',
userUsageRate: '用户使用率',
systemUsageRate: '系统使用率',
idleRate: '当先空闲率',
swap: 'Swap',
os: 'OS',
host: 'Host',

32
ruoyi-ui/src/views/check/create/index.vue
View File

@@ -2,7 +2,7 @@
<div class="app-container">
<!-- 主表信息录入 -->
<el-form :model="formData" ref="formRef" size="small" :inline="true" label-width="68px" :rules="rules">
<el-form-item :label="$t('checkCreate.warehouse')" prop="warehouseId" required> <!-- 仓库 -->
<el-form-item :label="$t('checkCreate.warehouse')" prop="warehouseId" required>
<el-select v-model="formData.warehouseId" :placeholder="$t('checkCreate.selectWarehouse')" clearable>
<el-option
v-for="dict in warehouseOptions"
@@ -12,13 +12,13 @@
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('checkCreate.customer')" prop="customerNo" required> <!-- 客户 -->
<!-- <el-form-item :label="$t('checkCreate.customer')" prop="customerNo" required> &lt;!&ndash; 客户 &ndash;&gt;
<el-input
v-model="formData.customerNo"
:placeholder="$t('checkCreate.inputCustomerNo')"
clearable
/>
</el-form-item>
</el-form-item>-->
<el-form-item :label="$t('checkCreate.documentType')" prop="checkType" required> <!-- 单据类型 -->
<el-select v-model="formData.checkType" :placeholder="$t('checkCreate.selectDocumentType')" clearable>
<el-option
@@ -54,6 +54,7 @@
<el-input-number v-model="scope.row.quantity" :min="1" size="mini" @change="handleQuantityChange(scope.row)" />
</template>
</el-table-column>
<el-table-column :label="$t('checkCreate.warehouse')" align="center" prop="warehouseName" /> <!-- 物资名称 -->
<el-table-column :label="$t('checkCreate.operation')" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.$index)">{{ $t('checkCreate.delete') }}</el-button> <!-- 删除 -->
@@ -88,14 +89,16 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="仓库" prop="warehouseId">
<el-input
v-model="queryParams.warehouseId"
placeholder="请输入仓库"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="仓库" prop="warehouseId">
<el-select v-model="queryParams.warehouseId" :placeholder="$t('checkCreate.selectWarehouse')" clearable>
<el-option
v-for="dict in warehouseOptions"
:key="dict.warehouseId"
:label="dict.warehouseName"
:value="dict.warehouseId"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('checkCreate.search') }}</el-button> <!-- 搜索 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('checkCreate.reset') }}</el-button> <!-- 重置 -->
@@ -107,6 +110,9 @@
<el-table-column :label="$t('checkCreate.materialCode')" align="center" prop="productId" /> <!-- 物资编码 -->
<el-table-column :label="$t('checkCreate.materialName')" align="center" prop="productName" /> <!-- 物资名称 -->
<el-table-column :label="$t('checkCreate.quantity')" align="center" prop="quantity" /> <!-- 数量 -->
<el-table-column :label="$t('checkCreate.lotNo')" align="center" prop="lotNo" /> <!-- 物资名称 -->
<el-table-column :label="$t('checkCreate.warehouse')" align="center" prop="warehouseName" /> <!-- 物资名称 -->
</el-table>
<div slot="footer" class="dialog-footer">
@@ -223,7 +229,9 @@
quantity: item.quantity,
quantityOrignal: item.quantity,
lotNo: item.lotNo,
onlyIdentity: item.onlyIdentity
onlyIdentity: item.onlyIdentity,
warehouseId: item.warehouseId,
warehouseName: item.warehouseName
}))
);
this.materialDialog = false;

6
ruoyi-ui/src/views/check/stockCheck/index.vue
View File

@@ -202,7 +202,7 @@
<dict-tag :options="dict.type.check_bill_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column :label="$t('checkStockCheck.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库ID -->
<el-table-column :label="$t('checkStockCheck.warehouseId')" align="center" prop="warehouseName" /> <!-- 仓库ID -->
<el-table-column :label="$t('checkStockCheck.stockSource')" align="center" prop="stockSource" /> <!-- 单据来源 -->
<el-table-column :label="$t('checkStockCheck.departmentNo')" align="center" prop="departmentNo" /> <!-- 部门编码 -->
<el-table-column :label="$t('checkStockCheck.createManId')" align="center" prop="createManId" /> <!-- 创建人 -->
@@ -228,8 +228,8 @@
<el-table-column :label="$t('checkStockCheck.productId')" align="center" prop="productId"/> <!-- 物料编码 -->
<el-table-column :label="$t('checkStockCheck.materialDesc')" align="center" prop="extraField.materialDesc"/> <!-- 物料描述 -->
<el-table-column :label="$t('checkStockCheck.englishDesc')" align="center" prop="extraField.englishDesc"/> <!-- 英文描述 -->
<el-table-column :label="$t('checkStockCheck.cartonNo')" align="center" prop="extraField.cartonNo"/> <!-- 箱号 -->
<el-table-column :label="$t('checkStockCheck.packingMethod')" align="center" prop="extraField.packingMethod"/> <!-- 包装方式 -->
<!-- <el-table-column :label="$t('checkStockCheck.cartonNo')" align="center" prop="extraField.cartonNo"/> &lt;!&ndash; 箱号 &ndash;&gt;-->
<!-- <el-table-column :label="$t('checkStockCheck.packingMethod')" align="center" prop="extraField.packingMethod"/> &lt;!&ndash; 包装方式 &ndash;&gt;-->
<el-table-column :label="$t('checkStockCheck.quantity')" align="center" prop="quantity"/> <!-- 计划数量 -->
<el-table-column :label="$t('checkStockCheck.scanNum')" align="center" prop="scanNum"/> <!-- 扫码数量 -->
<el-table-column :label="$t('checkStockCheck.assignNum')" align="center" prop="assignNum"/> <!-- 实际数量 -->

11
ruoyi-ui/src/views/in/receive/index.vue
View File

@@ -231,8 +231,7 @@
<!-- <el-table-column label="GUID" align="center" prop="stockinGuid" /> -->
<el-table-column :label="$t('inReceiveStockin.stockinId')" align="center" prop="stockinId"/><!--入库订单-->
<el-table-column :label="$t('inReceiveStockin.inType')" align="center" prop="inType"/><!--入库类型-->
<el-table-column :label="$t('inReceiveStockin.createDate')" align="center" prop="createDate"/><!--建立时间-->
<el-table-column :label="$t('inReceiveStockin.createManName')" align="center" prop="createManName"/><!--创建人-->
<el-table-column :label="$t('inReceiveStockin.status')" align="center" prop="status"><!--单据状态-->
<template slot-scope="scope">
<dict-tag :options="dict.type.receive_bill_status" :value="scope.row.status"/>
@@ -269,6 +268,8 @@
>删除</el-button>
</template>
</el-table-column> -->
<el-table-column :label="$t('inReceiveStockin.createManName')" align="center" prop="createManName"/><!--创建人-->
<el-table-column :label="$t('inReceiveStockin.createDate')" align="center" prop="createDate"/><!--建立时间-->
</el-table>
<pagination
@@ -316,10 +317,10 @@
<el-table-column :label="$t('inReceiveStockin.englishDesc')" align="center" prop="extraField.englishDesc"/><!--英文描述-->
<el-table-column :label="$t('inReceiveStockin.cartonNo')" align="center" prop="extraField.cartonNo"/><!--箱号-->
<el-table-column :label="$t('inReceiveStockin.packingMethod')" align="center" prop="extraField.packingMethod"/><!--包装方式-->
<el-table-column :label="$t('inReceiveStockin.grossWeight')" align="center" prop="extraField.grossWeight"/><!--毛重-->
<!-- <el-table-column :label="$t('inReceiveStockin.grossWeight')" align="center" prop="extraField.grossWeight"/>&lt;!&ndash;毛重&ndash;&gt;-->
<el-table-column :label="$t('inReceiveStockin.netWeight')" align="center" prop="extraField.netWeight"/><!--净重-->
<el-table-column :label="$t('inReceiveStockin.totalPrice')" align="center" prop="extraField.totalPrice"/><!--总价格-->
<el-table-column :label="$t('inReceiveStockin.totalNetWeight')" align="center" prop="extraField.totalNetWeight"/><!--总净重-->
<!-- <el-table-column :label="$t('inReceiveStockin.totalPrice')" align="center" prop="extraField.totalPrice"/>&lt;!&ndash;总价格&ndash;&gt;-->
<!-- <el-table-column :label="$t('inReceiveStockin.totalNetWeight')" align="center" prop="extraField.totalNetWeight"/>&lt;!&ndash;总净重&ndash;&gt;-->
<el-table-column :label="$t('inReceiveStockin.quantity')" width="120" align="center"><!--计划数量-->
<template slot-scope="scope">
<el-input-number

10
ruoyi-ui/src/views/in/stockIn/index.vue
View File

@@ -258,15 +258,12 @@
<dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
</template>
</el-table-column>
<el-table-column :label="$t('inReceiveStockin.createDate')" align="center" prop="createDate"/><!--建立时间-->
<el-table-column :label="$t('inReceiveStockin.createManName')" align="center" prop="createManName"/><!--创建人-->
<el-table-column :label="$t('inReceiveStockin.status')" align="center" prop="status"><!--单据状态-->
<template slot-scope="scope">
<dict-tag :options="dict.type.in_bill_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column :label="$t('inReceiveStockin.warehouseName')" align="center" prop="warehouseName"/><!--仓库-->
<el-table-column :label="$t('inStockin.finishDate')" align="center" prop="finishDate"/><!--完成日期-->
<el-table-column :label="$t('inReceiveStockin.stockSource')" align="center" prop="stockSource"><!--单据来源-->
<template slot-scope="scope">
<dict-tag :options="dict.type.bill_resource" :value="scope.row.stockSource"/>
@@ -274,6 +271,9 @@
</el-table-column>
<el-table-column :label="$t('inReceiveStockin.departmentName')" align="center" prop="departmentName"/><!--部门-->
<el-table-column :label="$t('inReceiveStockin.supplierName')" align="center" prop="supplierName"/><!--供应商-->
<el-table-column :label="$t('inReceiveStockin.createManName')" align="center" prop="createManName"/><!--创建人-->
<el-table-column :label="$t('inReceiveStockin.createDate')" align="center" prop="createDate"/><!--建立时间-->
<el-table-column :label="$t('inStockin.finishDate')" align="center" prop="finishDate"/><!--完成日期-->
</el-table>
<pagination
@@ -295,8 +295,8 @@
<el-table-column :label="$t('inReceiveStockin.cartonNo')" align="center" prop="extraField.cartonNo"/><!--箱号-->
<el-table-column :label="$t('inReceiveStockin.packingMethod')" align="center" prop="extraField.packingMethod"/><!--包装方式-->
<el-table-column :label="$t('inReceiveStockin.netWeight')" align="center" prop="extraField.netWeight" /> // 净重
<el-table-column :label="$t('inReceiveStockin.totalNetWeight')" align="center" prop="extraField.totalNetWeight" /> // 总净重
<el-table-column :label="$t('inReceiveStockin.grossWeight')" align="center" prop="extraField.grossWeight" /> // 毛重
<!-- <el-table-column :label="$t('inReceiveStockin.totalNetWeight')" align="center" prop="extraField.totalNetWeight" /> // 总净重-->
<!-- <el-table-column :label="$t('inReceiveStockin.grossWeight')" align="center" prop="extraField.grossWeight" /> // 毛重-->
<el-table-column :label="$t('inReceiveStockin.quantity')" align="center" prop="quantity"/><!--计划数量-->
<el-table-column :label="$t('inStockin.scanNum')" align="center" prop="scanNum"/><!--扫码数量-->
<el-table-column :label="$t('inStockin.assignNum')" align="center" prop="assignNum"/><!--实际数量-->

10
ruoyi-ui/src/views/stock/freeze/index.vue
View File

@@ -122,7 +122,7 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="primary"
plain
@@ -130,7 +130,7 @@
size="mini"
@click="handleAdd"
v-hasPermi="['stock:freeze:add']"
>{{$t('stockFreeze.add')}}</el-button> <!-- 新增 -->
>{{$t('stockFreeze.add')}}</el-button> &lt;!&ndash; 新增 &ndash;&gt;
</el-col>
<el-col :span="1.5">
<el-button
@@ -141,7 +141,7 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['stock:freeze:edit']"
>{{$t('stockFreeze.edit')}}</el-button> <!-- 修改 -->
>{{$t('stockFreeze.edit')}}</el-button> &lt;!&ndash; 修改 &ndash;&gt;
</el-col>
<el-col :span="1.5">
<el-button
@@ -152,8 +152,8 @@
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['stock:freeze:remove']"
>{{$t('stockFreeze.delete')}}</el-button> <!-- 删除 -->
</el-col>
>{{$t('stockFreeze.delete')}}</el-button> &lt;!&ndash; 删除 &ndash;&gt;
</el-col>-->
<el-col :span="1.5">
<el-button
type="warning"