From 1acc3ec6d40ed8ee70a6f0e572c1dd4eacb90c3a Mon Sep 17 00:00:00 2001
From: liuhanqing <liuhanqing1@bonc.com.cn>
Date: Tue, 16 Sep 2025 16:09:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8D=95=E4=BD=8D=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MydoJobServiceImpl.java       | 18 ++++++++++++++++--
 .../mapper/job/MydoJobDetailFinishMapper.xml   |  1 +
 .../resources/mapper/stock/BasStockMapper.xml  |  5 +++--
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
index 12c44c9..c37b660 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
@@ -299,14 +299,28 @@ public class MydoJobServiceImpl implements IMydoJobService {
         stock.setQuantity(mydoJobDetail.getInQuantity());
         stock.setJobId(mydoJob.getJobId());
         stock.setTrayCode(mydoJob.getTrayCode());
-        stock.setInClassId(mydoJob.getClassId());
         stock.setWarehouseId(mydoJob.getWarehouseId());
-        stock.setStackingId(mydoJobDetail.getStackingId());
         stock.setOutQuantity("0");
         stock.setProductId(mydoJobDetail.getProductId());
         stock.setStockinId(mydoJobDetail.getInOrOutId());
         stock.setStockinDetailId(mydoJobDetail.getInOrOutDId());
         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;
     }
 
diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml
index da182d5..2056937 100644
--- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml
@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="spare9"    column="spare9"    />
         <result property="spec"    column="spec"    />
         <result property="unit"    column="unit"    />
+        <result property="productName"    column="product_name"    />
     </resultMap>
 
 
diff --git a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
index f8cd92e..d260168 100644
--- a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
@@ -184,10 +184,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     <insert id="insertBasStockList">
         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
             <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>
     </insert>