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

新建入库单据 入库单据管理页面 供应商修改 对应字段你修改

Browse Source
This commit is contained in:
liuhanqing
2025-10-20 10:26:30 +08:00
parent 5a128b6d9a
commit ecb2fe1722
7 changed files with 49 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java
View File

@@ -217,5 +217,7 @@ public class BasProduct extends BaseEntity
private String updateId;
private String supplierId;
}

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

@@ -102,7 +102,7 @@ public class InStockinServiceImpl implements IInStockinService
inStockin.setCreateDate(DateUtil.formatDateTime(DateUtil.date()));
inStockin.setCreateManId(Convert.toStr(SecurityUtils.getUserId()));
inStockin.setDepartmentNo(Convert.toStr(SecurityUtils.getDeptId()));
inStockin.setSupplierNo(inStockinVo.getSupplierId());
//inStockin.setSupplierNo(inStockinVo.getSupplierId());
inStockin.setErpBill(inStockinVo.getErpBill());
inStockin.setInType(inStockinVo.getInType());
inStockin.setWarehouseId(inStockinVo.getWarehouseId());
@@ -112,6 +112,7 @@ public class InStockinServiceImpl implements IInStockinService
for (int i = 1; i <= productVoList.size(); i++) {
BasProduct basProduct = productVoList.get(i-1);
InStockinDetail inStockinDetail = new InStockinDetail();
inStockinDetail.setSupplierId(basProduct.getSupplierId());
BeanUtil.copyProperties(basProduct,inStockinDetail);
inStockinDetail.setStockinGuid(inStockin.getStockinGuid());
inStockinDetail.setStockinDetailId(inStockin.getStockinId()+"-"+i);

2
ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java
View File

@@ -97,6 +97,8 @@ public class InStockinDetail extends BaseEntity
/** 供应商编码 */
@Excel(name = "供应商编码")
private String supplierId;
@Excel(name = "供应商名称")
private String supplierName;
/** 客户编码 */
@Excel(name = "客户编码")

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

@@ -75,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="scanNumX" column="scan_num_x" />
<result property="scanNumJ" column="scan_num_j" />
<result property="productName" column="product_name" />
<result property="supplierName" column="supplier_name" />
<!--<association property="extraField" javaType="ExtraField">
<result property="productId" column="product_id" />
@@ -95,9 +96,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
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,
isd.spare7,isd.spare8,isd.spare9
isd.spare7,isd.spare8,isd.spare9,bs.supplier_name
from in_stockin_detail_finish isd
left join bas_product bp on bp.product_id = isd.product_id
left join bas_supplier bs on bs.supplier_no = isd.supplier_id
</sql>
<select id="selectInStockinDetailFinishList" parameterType="InStockinDetailFinish" resultMap="InStockinDetailFinishResult">

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

@@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="warehouseName" column="warehouse_name" />
<result property="warehouseId" column="warehouse_id" />
<result property="productName" column="product_name" />
<result property="supplierName" column="supplier_name" />
<!-- <association property="extraField" javaType="ExtraField">-->
<!-- <result property="productId" column="product_id" />-->
<!-- <result property="materialDesc" column="product_name" />-->
@@ -61,9 +62,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
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,
isd.spare7,isd.spare8,isd.spare9
isd.spare7,isd.spare8,isd.spare9,bs.supplier_name
from in_stockin_detail isd
left join bas_product bp on bp.product_id = isd.product_id
left join bas_supplier bs on bs.supplier_no = isd.supplier_id
</sql>
<select id="selectInStockinDetailList" parameterType="InStockinDetail" resultMap="InStockinDetailResult">
@@ -138,7 +140,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare7 != null">spare7,</if>
<if test="spare8 != null">spare8,</if>
<if test="spare9 != null">spare9,</if>
<if test="spec != null">spec,</if>
<if test="scanNum != null">scan_num,</if>
<if test="scanNumX != null">scan_num_x,</if>
<if test="scanNumJ != null">scan_num_j,</if>
@@ -174,7 +175,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare7 != null">#{spare7},</if>
<if test="spare8 != null">#{spare8},</if>
<if test="spare9 != null">#{spare9},</if>
<if test="spec != null">#{spec},</if>
<if test="scanNum != null">#{scanNum},</if>
<if test="scanNumX != null">#{scanNumX},</if>
<if test="scanNumJ != null">#{scanNumJ},</if>