调拨单 结算单

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/service/impl/PurchaseWarehousingServiceImpl.java

@@ -623,10 +623,10 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
         RdRecord08Map.put("cCode",oConvertUtils.addOne(getMaxId("cCode","RdRecord08")));
         //修改最大编码
         this.baseMapper.updateVoucherHistoryCNumber(oConvertUtils.maxNumber(String.valueOf(RdRecord08Map.get("cCode"))),"0301");
-        RdRecord08Map.put("cWhCode",transVouchMao.get("cOWhCode"));//仓库 调拨单转出仓库
+        RdRecord08Map.put("cWhCode",transVouchMao.get("cIWhCode"));//仓库 调拨单转入仓库
         RdRecord08Map.put("cBusCode",transVouchMao.get("cTVCode"));//调拨单号
         RdRecord08Map.put("cPersonCode",transVouchMao.get("cPersonCode"));//业务员
-        RdRecord08Map.put("cDepCode",transVouchMao.get("cODepCode"));//部门 转出部门
+        RdRecord08Map.put("cDepCode",transVouchMao.get("cIDepCode"));//部门 转入部门
         RdRecord08Map.put("ID",oConvertUtils.addOne(getMaxId("ID","RdRecord08")));//ID
         RdRecord08Map.put("bredvouch",0);//红蓝标识
         this.baseMapper.saveRdRecord08(RdRecord08Map);

jeecg-boot-module-system/target/classes/org/jeecg/modules/openApi/mapper/xml/PurchaseWarehousingMapper.xml

@@ -268,7 +268,7 @@
         iRdsID,<!--蓝字入库单子表id-->
         bAccount,
         crdcvencode,<!--入库单供应商编码-->
-        cUpSoType,<!--入库单单据类型-->
+        cUpSoType<!--入库单单据类型-->
         )
         VALUES(
         #{map.cPIVCode},
@@ -283,7 +283,7 @@
         #{map.iRdsID},
         0,
         #{map.crdcvencode},
-        '01',
+        '01'
         )
     </insert>
 
@@ -291,15 +291,25 @@
         select cVenCode,cVenDefine1,cVenDefine2,cVenAbbName from Vendor where cVenCode=#{cVenCode}
     </select>
 
-    <select id="getRdrecords01WriteQuantity" resultType="java.util.HashMap" parameterType="java.lang.String">
+    <select id="getRdrecords01WriteQuantity" resultType="java.math.BigDecimal" parameterType="java.lang.String">
         SELECT SUM
-                   ( rs.iQuantity ) - SUM ( rs.iSumBillQuantity )
+                   ( rs.iQuantity ) - SUM ( rs.iSumBillQuantity ) as iQuantity
+        FROM
+            rdrecords01 rs
+                LEFT JOIN RdRecord01 r ON rs.ID= r.ID
+        WHERE
+            r.bredvouch= 0
+          AND (rs.iPOsID= #{rowmId} or rs.iOMoDID= #{rowmId})
+    </select>
+
+    <select id="getRdrecords01Entity" resultType="java.util.HashMap" parameterType="java.lang.String">
+        SELECT rs.*
         FROM
             rdrecords01 rs
                 LEFT JOIN RdRecord01 r ON rs.ID= r.ID
         WHERE
             r.bredvouch= 0
-          AND rs.iPOsID= #{rowmId}
+          AND (rs.iPOsID= #{rowmId} or rs.iOMoDID= #{rowmId})
     </select>
 
     <select id="getPOPodetailsINatUnitPrice" parameterType="java.lang.String" resultType="java.util.HashMap">
@@ -716,17 +726,17 @@
         WHERE
             cWhCode = #{map.cWhCode}
           AND cInvCode = #{map.cInvCode}
-          AND cBatch = #{map.cBatch}
-          AND cFree1 = #{map.cFree1}
-          AND cFree2 = #{map.cFree2}
-          AND cFree3 = #{map.cFree3}
-          AND cFree4 = #{map.cFree4}
-          AND cFree5 = #{map.cFree5}
-          AND cFree6 = #{map.cFree6}
-          AND cFree7 = #{map.cFree7}
-          AND cFree8 = #{map.cFree8}
-          AND cFree9 = #{map.cFree9}
-          AND cFree10 = #{map.cFree10}
+          AND isnull(cBatch,'') = #{map.cBatch}
+          AND isnull(cFree1,'') = #{map.cFree1}
+          AND isnull(cFree2,'') = #{map.cFree2}
+          AND isnull(cFree3,'') = #{map.cFree3}
+          AND isnull(cFree4,'') = #{map.cFree4}
+          AND isnull(cFree5,'') = #{map.cFree5}
+          AND isnull(cFree6,'') = #{map.cFree6}
+          AND isnull(cFree7,'') = #{map.cFree7}
+          AND isnull(cFree8,'') = #{map.cFree8}
+          AND isnull(cFree9,'') = #{map.cFree9}
+          AND isnull(cFree10,'') = #{map.cFree10}
     </select>
 
     <update id="updateCurrentStock" parameterType="java.util.HashMap">
@@ -734,17 +744,17 @@
         WHERE
             cWhCode = #{map.cWhCode}
           AND cInvCode = #{map.cInvCode}
-          AND cBatch = #{map.cBatch}
-          AND cFree1 = #{map.cFree1}
-          AND cFree2 = #{map.cFree2}
-          AND cFree3 = #{map.cFree3}
-          AND cFree4 = #{map.cFree4}
-          AND cFree5 = #{map.cFree5}
-          AND cFree6 = #{map.cFree6}
-          AND cFree7 = #{map.cFree7}
-          AND cFree8 = #{map.cFree8}
-          AND cFree9 = #{map.cFree9}
-          AND cFree10 = #{map.cFree10}
+          AND isnull(cBatch,'') = #{map.cBatch}
+          AND isnull(cFree1,'') = #{map.cFree1}
+          AND isnull(cFree2,'') = #{map.cFree2}
+          AND isnull(cFree3,'') = #{map.cFree3}
+          AND isnull(cFree4,'') = #{map.cFree4}
+          AND isnull(cFree5,'') = #{map.cFree5}
+          AND isnull(cFree6,'') = #{map.cFree6}
+          AND isnull(cFree7,'') = #{map.cFree7}
+          AND isnull(cFree8,'') = #{map.cFree8}
+          AND isnull(cFree9,'') = #{map.cFree9}
+          AND isnull(cFree10,'') = #{map.cFree10}
     </update>
 
     <select id="getCurrentStock" parameterType="java.util.HashMap" resultType="java.util.HashMap">
@@ -752,17 +762,17 @@
         where
             cWhCode = #{map.cWhCode}
           AND cInvCode = #{map.cInvCode}
-          AND cBatch = #{map.cBatch}
-          AND cFree1 = #{map.cFree1}
-          AND cFree2 = #{map.cFree2}
-          AND cFree3 = #{map.cFree3}
-          AND cFree4 = #{map.cFree4}
-          AND cFree5 = #{map.cFree5}
-          AND cFree6 = #{map.cFree6}
-          AND cFree7 = #{map.cFree7}
-          AND cFree8 = #{map.cFree8}
-          AND cFree9 = #{map.cFree9}
-          AND cFree10 = #{map.cFree10}
+          AND isnull(cBatch,'') = #{map.cBatch}
+          AND isnull(cFree1,'') = #{map.cFree1}
+          AND isnull(cFree2,'') = #{map.cFree2}
+          AND isnull(cFree3,'') = #{map.cFree3}
+          AND isnull(cFree4,'') = #{map.cFree4}
+          AND isnull(cFree5,'') = #{map.cFree5}
+          AND isnull(cFree6,'') = #{map.cFree6}
+          AND isnull(cFree7,'') = #{map.cFree7}
+          AND isnull(cFree8,'') = #{map.cFree8}
+          AND isnull(cFree9,'') = #{map.cFree9}
+          AND isnull(cFree10,'') = #{map.cFree10}
     </select>
 
     <insert id="insertCurrentStock">
@@ -790,16 +800,16 @@
         select * from SCM_ITEM
         where
             cInvCode = #{map.cInvCode}
-          AND cFree1 = #{map.cFree1}
-          AND cFree2 = #{map.cFree2}
-          AND cFree3 = #{map.cFree3}
-          AND cFree4 = #{map.cFree4}
-          AND cFree5 = #{map.cFree5}
-          AND cFree6 = #{map.cFree6}
-          AND cFree7 = #{map.cFree7}
-          AND cFree8 = #{map.cFree8}
-          AND cFree9 = #{map.cFree9}
-          AND cFree10 = #{map.cFree10}
+          AND isnull(cFree1,'') = #{map.cFree1}
+          AND isnull(cFree2,'') = #{map.cFree2}
+          AND isnull(cFree3,'') = #{map.cFree3}
+          AND isnull(cFree4,'') = #{map.cFree4}
+          AND isnull(cFree5,'') = #{map.cFree5}
+          AND isnull(cFree6,'') = #{map.cFree6}
+          AND isnull(cFree7,'') = #{map.cFree7}
+          AND isnull(cFree8,'') = #{map.cFree8}
+          AND isnull(cFree9,'') = #{map.cFree9}
+          AND isnull(cFree10,'') = #{map.cFree10}
     </select>
 
     <insert id="saveSCM_ITEM">
@@ -826,17 +836,17 @@
             AA_BatchProperty
         WHERE
             cInvCode = #{map.cInvCode}
-          AND cBatch = #{map.cBatch}
-          AND cFree1 = #{map.cFree1}
-          AND cFree2 = #{map.cFree2}
-          AND cFree3 = #{map.cFree3}
-          AND cFree4 = #{map.cFree4}
-          AND cFree5 = #{map.cFree5}
-          AND cFree6 = #{map.cFree6}
-          AND cFree7 = #{map.cFree7}
-          AND cFree8 = #{map.cFree8}
-          AND cFree9 = #{map.cFree9}
-          AND cFree10 = #{map.cFree10}
+          AND isnull(cBatch,'') = #{map.cBatch}
+          AND isnull(cFree1,'') = #{map.cFree1}
+          AND isnull(cFree2,'') = #{map.cFree2}
+          AND isnull(cFree3,'') = #{map.cFree3}
+          AND isnull(cFree4,'') = #{map.cFree4}
+          AND isnull(cFree5,'') = #{map.cFree5}
+          AND isnull(cFree6,'') = #{map.cFree6}
+          AND isnull(cFree7,'') = #{map.cFree7}
+          AND isnull(cFree8,'') = #{map.cFree8}
+          AND isnull(cFree9,'') = #{map.cFree9}
+          AND isnull(cFree10,'') = #{map.cFree10}
     </select>
 
     <update id="updateAA_BatchPropertyByID">
@@ -893,16 +903,16 @@
         select * from OM_MOMaterials where
             MoDetailsID = #{map.MoDetailsID}
            and cInvCode = #{map.cInvCode}
-           AND cFree1 = #{map.cFree1}
-           AND cFree2 = #{map.cFree2}
-           AND cFree3 = #{map.cFree3}
-           AND cFree4 = #{map.cFree4}
-           AND cFree5 = #{map.cFree5}
-           AND cFree6 = #{map.cFree6}
-           AND cFree7 = #{map.cFree7}
-           AND cFree8 = #{map.cFree8}
-           AND cFree9 = #{map.cFree9}
-           AND cFree10 = #{map.cFree10}
+           AND isnull(cFree1,'') = #{map.cFree1}
+           AND isnull(cFree2,'') = #{map.cFree2}
+           AND isnull(cFree3,'') = #{map.cFree3}
+           AND isnull(cFree4,'') = #{map.cFree4}
+           AND isnull(cFree5,'') = #{map.cFree5}
+           AND isnull(cFree6,'') = #{map.cFree6}
+           AND isnull(cFree7,'') = #{map.cFree7}
+           AND isnull(cFree8,'') = #{map.cFree8}
+           AND isnull(cFree9,'') = #{map.cFree9}
+           AND isnull(cFree10,'') = #{map.cFree10}
     </select>
 
     <update id="updateOM_MOMaterialsfTransQty" parameterType="java.util.HashMap">