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

添加单位字段

Browse Source
This commit is contained in:
liuhanqing
2025-09-16 16:09:03 +08:00
parent edf879a5ad
commit 1acc3ec6d4
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
View File

@@ -299,14 +299,28 @@ public class MydoJobServiceImpl implements IMydoJobService {
stock.setQuantity(mydoJobDetail.getInQuantity()); stock.setQuantity(mydoJobDetail.getInQuantity());
stock.setJobId(mydoJob.getJobId()); stock.setJobId(mydoJob.getJobId());
stock.setTrayCode(mydoJob.getTrayCode()); stock.setTrayCode(mydoJob.getTrayCode());
stock.setInClassId(mydoJob.getClassId());
stock.setWarehouseId(mydoJob.getWarehouseId()); stock.setWarehouseId(mydoJob.getWarehouseId());
stock.setStackingId(mydoJobDetail.getStackingId());
stock.setOutQuantity("0"); stock.setOutQuantity("0");
stock.setProductId(mydoJobDetail.getProductId()); stock.setProductId(mydoJobDetail.getProductId());
stock.setStockinId(mydoJobDetail.getInOrOutId()); stock.setStockinId(mydoJobDetail.getInOrOutId());
stock.setStockinDetailId(mydoJobDetail.getInOrOutDId()); stock.setStockinDetailId(mydoJobDetail.getInOrOutDId());
stock.setInType(mydoJob.getInOrOut()); stock.setInType(mydoJob.getInOrOut());
stock.setSpare1(mydoJobDetail.getSpec());
stock.setSpare4(mydoJobDetail.getSpare1());
stock.setSpare5(mydoJobDetail.getSpare3());
stock.setSpare6(mydoJobDetail.getSpare4());
stock.setProductName(mydoJobDetail.getProductName());
stock.setVoltage(mydoJobDetail.getSpare5());
stock.setPower(mydoJobDetail.getSpare6());
stock.setPhase(mydoJobDetail.getSpare7());
stock.setNetWeight(mydoJobDetail.getSpare2());
stock.setGrossWeight(mydoJobDetail.getSpare8());
stock.setDistribution(mydoJobDetail.getSpare9());
stock.setModel(mydoJobDetail.getUnit());
stock.setOrderId(mydoJob.getLineId());
stock.setLotNo(mydoJobDetail.getLotNo());
stock.setWarehouseId(mydoJob.getWarehouseId());
stock.setSpare3(mydoJobDetail.getSupplierId());
return stock; return stock;
} }

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

@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare9" column="spare9" /> <result property="spare9" column="spare9" />
<result property="spec" column="spec" /> <result property="spec" column="spec" />
<result property="unit" column="unit" /> <result property="unit" column="unit" />
<result property="productName" column="product_name" />
</resultMap> </resultMap>

5
ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
View File

@@ -184,10 +184,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</insert> </insert>
<insert id="insertBasStockList"> <insert id="insertBasStockList">
INSERT INTO bas_stock INSERT INTO bas_stock
(stock_id,cargo_space_id,stock_status,product_status,lot_no,in_date,back_date,product_guid,quantity,job_id,tray_code,out_quantity,stockin_detail_id,stockin_id,in_type,in_class_id,warehouse_id,stacking_id,spare1,spare2,spare3,spare4,spare5,spare6,product_id) (stock_id,cargo_space_id,stock_status,product_status,lot_no,in_date,back_date,product_guid,quantity,job_id,tray_code,out_quantity,stockin_detail_id,stockin_id,in_type,in_class_id,warehouse_id,stacking_id,spare1,spare2,spare3,spare4,spare5,spare6,product_id,product_name,voltage,power,phase,net_weight,gross_weight,distribution,model,order_id)
VALUES VALUES
<foreach collection="list" item="item" separator=","> <foreach collection="list" item="item" separator=",">
(#{item.stockId},#{item.cargoSpaceId},#{item.stockStatus},#{item.productStatus},#{item.lotNo},#{item.inDate},#{item.backDate},#{item.productGuid},#{item.quantity},#{item.jobId},#{item.trayCode},#{item.outQuantity},#{item.stockinDetailId},#{item.stockinId},#{item.inType},#{item.inClassId},#{item.warehouseId},#{item.stackingId},#{item.spare1},#{item.spare2},#{item.spare3},#{item.spare4},#{item.spare5},#{item.spare6},#{item.productId}) (#{item.stockId},#{item.cargoSpaceId},#{item.stockStatus},#{item.productStatus},#{item.lotNo},#{item.inDate},#{item.backDate},#{item.productGuid},#{item.quantity},#{item.jobId},#{item.trayCode},#{item.outQuantity},#{item.stockinDetailId},#{item.stockinId},#{item.inType},#{item.inClassId},#{item.warehouseId},#{item.stackingId},#{item.spare1},#{item.spare2},#{item.spare3},#{item.spare4},#{item.spare5},#{item.spare6},#{item.productId}
,#{item.productName},#{item.voltage},#{item.power},#{item.phase},#{item.netWeight},#{item.grossWeight},#{item.distribution},#{item.model},#{item.orderId})
</foreach> </foreach>
</insert> </insert>