From 45d79de64c59db5951eedc70f13b17d4f5ad9149 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 6 Jan 2025 14:17:03 +0800
Subject: [PATCH] md

---
 .../service/impl/EmisWarehouseInBatchServiceImpl.java     | 2 ++
 .../main/resources/mapper/EmisWarehouseInBatchMapper.xml  | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java
index 8a88c462e..03c12834a 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java
@@ -107,6 +107,8 @@ public class EmisWarehouseInBatchServiceImpl extends EmisBaseService implements
         }
 
 
+
+
         // 判断是否已经开单，开单后不允许再次入仓
         EmisWarehouseIn emisWarehouseIn=emisWarehouseInMapper.selectEmisWarehouseInByInNo(emisWarehouseInBatch.getInNo());
         if(emisWarehouseIn==null){
diff --git a/emis-biz/src/main/resources/mapper/EmisWarehouseInBatchMapper.xml b/emis-biz/src/main/resources/mapper/EmisWarehouseInBatchMapper.xml
index 13d753ac5..fdabf5b4c 100644
--- a/emis-biz/src/main/resources/mapper/EmisWarehouseInBatchMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWarehouseInBatchMapper.xml
@@ -174,9 +174,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="prepareInRemark != null and prepareInRemark != ''">#{prepareInRemark},</if>
             <if test="prepareInSupplier != null and prepareInSupplier != ''">#{prepareInSupplier},</if>
             <if test="packType != null and packType != ''">#{packType},</if>
-            <if test="totalParcelQty != null">#{totalParcelQty},</if>
+            <if test="totalParcelQty != null">#{parcelQty},</if>
             <if test="totalVolume != null">#{totalVolume},</if>
-            <if test="totalWeight != null">#{totalWeight},</if>
+            <if test="totalWeight != null">#{billWeight},</if>
             <if test="parcelQty != null">#{parcelQty},</if>
             <if test="billWeight != null">#{billWeight},</if>
             <if test="realValue != null and realValue != ''">#{realValue},</if>
@@ -219,9 +219,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="prepareInRemark != null and prepareInRemark != ''">prepare_in_remark = #{prepareInRemark},</if>
             <if test="prepareInSupplier != null and prepareInSupplier != ''">prepare_in_supplier = #{prepareInSupplier},</if>
             <if test="packType != null and packType != ''">pack_type = #{packType},</if>
-            <if test="totalParcelQty != null">total_parcel_qty = #{totalParcelQty},</if>
+            <if test="totalParcelQty != null">total_parcel_qty = #{parcelQty},</if>
             <if test="totalVolume != null">total_volume = #{totalVolume},</if>
-            <if test="totalWeight != null">total_weight = #{totalWeight},</if>
+            <if test="totalWeight != null">total_weight = #{billWeight},</if>
             <if test="parcelQty != null">parcel_qty = #{parcelQty},</if>
             <if test="billWeight != null">bill_weight = #{billWeight},</if>
             <if test="realValue != null and realValue != ''">real_value = #{realValue},</if>