入库单

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/mapper/PurchaseWarehousingMapper.java

@@ -17,70 +17,70 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface PurchaseWarehousingMapper extends BaseMapper<PurchaseWarehousing> {
 
     /**
-    * @Author chenchuang
-    * @Description //TODO 获取最新id
-    * @Date 2022/4/1 14:34
-    * @Param [table]
-    * @return java.lang.String
-    */
+     * @Author chenchuang
+     * @Description //TODO 获取最新id
+     * @Date 2022/4/1 14:34
+     * @Param [table]
+     * @return java.lang.String
+     */
     String getMaxId(@Param("id")String id,@Param("tableName")String tableName);
 
     String getMaxCode(@Param("code")String code,@Param("tableName")String tableName);
 
     /**
-    * @Author chenchuang
-    * @Description //TODO 采购入库主表新增
-    * @Date 2022/4/1 16:30
-    * @Param [map]
-    * @return void
-    */
+     * @Author chenchuang
+     * @Description //TODO 采购入库主表新增
+     * @Date 2022/4/1 16:30
+     * @Param [map]
+     * @return void
+     */
     void saveRdRecord01One(@Param("RdRecord01")Map<String,Object> map);
 
     /**
-    * @Author chenchuang
-    * @Description //TODO 采购入库子表新增
-    * @Date 2022/4/1 18:54
-    * @Param [list]
-    * @return void
-    */
+     * @Author chenchuang
+     * @Description //TODO 采购入库子表新增
+     * @Date 2022/4/1 18:54
+     * @Param [list]
+     * @return void
+     */
     void saveRdrecords01One(@Param("list")List<Map<String,Object>> list);
 
     void saveRdrecords01(@Param("map")Map<String,Object> map);
 
     /**
-    * @Author chenchuang
-    * @Description //TODO 根据人员编码查询部门编码
-    * @Date 2022/4/14 13:34
-    * @Param [cPersonCode]
-    * @return java.util.Map<java.lang.String,java.lang.Object>
-    */
+     * @Author chenchuang
+     * @Description //TODO 根据人员编码查询部门编码
+     * @Date 2022/4/14 13:34
+     * @Param [cPersonCode]
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     */
     Map<String,Object> getPerson(@Param("cPersonCode")String cPersonCode);
 
     /**
-    * @Author chenchuang
-    * @Description //TODO 根据委外子表id获取委外子表相关信息
-    * @Date 2022/4/14 15:00
-    * @Param [moDetailsId]
-    * @return java.util.Map<java.lang.String,java.lang.Object>
-    */
+     * @Author chenchuang
+     * @Description //TODO 根据委外子表id获取委外子表相关信息
+     * @Date 2022/4/14 15:00
+     * @Param [moDetailsId]
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     */
     Map<String,Object> getOMMoDetails(@Param("moDetailsId")String moDetailsId);
 
     /**
-    * @Author chenchuang
-    * @Description //TODO 根据供应商编码查询成品仓和原材料仓库
-    * @Date 2022/4/14 16:35
-    * @Param [cVenCode]
-    * @return java.util.Map<java.lang.String,java.lang.Object>
-    */
+     * @Author chenchuang
+     * @Description //TODO 根据供应商编码查询成品仓和原材料仓库
+     * @Date 2022/4/14 16:35
+     * @Param [cVenCode]
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     */
     Map<String,Object> getWhCodeByVenCode(@Param("cVenCode")String cVenCode);
 
     /**
-    * @Author chenchuang
-    * @Description //TODO 新增调拨单主表
-    * @Date 2022/4/22 17:23
-    * @Param [map]
-    * @return void
-    */
+     * @Author chenchuang
+     * @Description //TODO 新增调拨单主表
+     * @Date 2022/4/22 17:23
+     * @Param [map]
+     * @return void
+     */
     void saveTransVouch(@Param("map")Map<String,Object> map);
 
     /**
@@ -113,79 +113,124 @@ public interface PurchaseWarehousingMapper extends BaseMapper<PurchaseWarehousin
      */
     void saveRdRecords08(@Param("map")Map<String,Object> map);
     /**
-    * @Author chenchuang
-    * @Description //TODO 根据红字获取对应采购订单行的蓝字根据入库数量与发票数量判断是否需要做结算单的数量
-    * @Date 2022/4/26 14:14
-    * @Param [rowmId]
-    * @return java.math.BigDecimal
-    */
+     * @Author chenchuang
+     * @Description //TODO 根据红字获取对应采购订单行的蓝字根据入库数量与发票数量判断是否需要做结算单的数量
+     * @Date 2022/4/26 14:14
+     * @Param [rowmId]
+     * @return java.math.BigDecimal
+     */
     BigDecimal getRdrecords01WriteQuantity(@Param("rowmId")String rowmId);
 
     /**
-    * @Author chenchuang
-    * @Description //TODO 根据采购订单行id获取相关数据
-    * @Date 2022/4/26 15:12
-    * @Param [rowmId]
-    * @return java.math.BigDecimal
-    */
+     * @Author chenchuang
+     * @Description //TODO 根据采购订单行id获取相关数据
+     * @Date 2022/4/26 15:12
+     * @Param [rowmId]
+     * @return java.math.BigDecimal
+     */
     Map<String,Object> getPOPodetailsINatUnitPrice(@Param("rowmId")String rowmId);
 
     /**
-    * @Author chenchuang
-    * @Description //TODO 新增结算单主表
-    * @Date 2022/4/26 17:40
-    * @Param [map]
-    * @return void
-    */
+     * @Author chenchuang
+     * @Description //TODO 新增结算单主表
+     * @Date 2022/4/26 17:40
+     * @Param [map]
+     * @return void
+     */
     void savePurSettleVouch(@Param("map")Map<String,Object> map);
 
     /**
-    * @Author chenchuang
-    * @Description //TODO 新增结算单子表
-    * @Date 2022/4/26 18:43
-    * @Param [map]
-    * @return void
-    */
+     * @Author chenchuang
+     * @Description //TODO 新增结算单子表
+     * @Date 2022/4/26 18:43
+     * @Param [map]
+     * @return void
+     */
     void savePurSettleVouchs(@Param("map")Map<String,Object> map);
 
     /**
-    * @Author chenchuang
-    * @Description //TODO 根据采购订单行id获取采购订单行数据
-    * @Date 2022/4/27 21:23
-    * @Param [rowmId]
-    * @return java.util.Map<java.lang.String,java.lang.Object>
-    */
+     * @Author chenchuang
+     * @Description //TODO 根据采购订单行id获取采购订单行数据
+     * @Date 2022/4/27 21:23
+     * @Param [rowmId]
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     */
     Map<String,Object> getPOPodetails(@Param("rowmId")String rowmId);
 
     /**
-    * @Author chenchuang
-    * @Description //TODO 根据委外订单行id获取委外订单行数据
-    * @Date 2022/4/27 21:38
-    * @Param [rowmId]
-    * @return java.util.Map<java.lang.String,java.lang.Object>
-    */
+     * @Author chenchuang
+     * @Description //TODO 根据委外订单行id获取委外订单行数据
+     * @Date 2022/4/27 21:38
+     * @Param [rowmId]
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     */
     Map<String,Object> getOMMODetails(@Param("rowmId")String rowmId);
 
     /**
-    * @Author chenchuang
-    * @Description //TODO 回写采购订单行入库数量
-    * @Date 2022/4/27 22:48
-    * @Param [map]
-    * @return void
-    */
+     * @Author chenchuang
+     * @Description //TODO 回写采购订单行入库数量
+     * @Date 2022/4/27 22:48
+     * @Param [map]
+     * @return void
+     */
     void updatePodetailsfreceivedqty(@Param("map")Map<String,Object> map);
 
     /**
-    * @Author chenchuang
-    * @Description //TODO 回写委外订单行入库数量
-    * @Date 2022/4/27 22:49
-    * @Param [map]
-    * @return void
-    */
+     * @Author chenchuang
+     * @Description //TODO 回写委外订单行入库数量
+     * @Date 2022/4/27 22:49
+     * @Param [map]
+     * @return void
+     */
     void updateOMMODetailsfreceivedqty(@Param("map")Map<String,Object> map);
 
     /**
      * 修改流水号最大值
      */
     void updateVoucherHistoryCNumber(@Param("cNumber")String cNumber,@Param("cardNumber")String cardNumber);
+
+    /**
+     * 查询现存量是否存在对应存货
+     * @param map
+     * @return
+     */
+    Integer getCurrentStockCount(@Param("map")Map<String,Object> map);
+
+    /**
+     * 修改现存量的数量
+     * @param map
+     */
+    void updateCurrentStock(@Param("map")Map<String,Object> map);
+
+    /**
+     * 根据订单号获取采购主表信息
+     * @param cPOID
+     * @return
+     */
+    Map<String,Object> getPO_PomainBycPOID(@Param("cPOID")String cPOID);
+
+    /**
+     * 根据订单号获取委外订单主表
+     * @param cCode
+     * @return
+     */
+    Map<String,Object> getOM_MOmainBycCode(@Param("cCode")String cCode);
+
+    /**
+     * 根据相关字段获取AA表是否存在
+     * @return
+     */
+    List<Map<String,Object>> getAA_BatchPropertyCount(@Param("map")Map<String,Object> map);
+
+    /**
+     * 修改AA表存在的
+     * @param map
+     */
+    void updateAA_BatchPropertyByID(@Param("map")Map<String,Object> map);
+
+    /**
+     * 向AA表中插入一条数据
+     * @param map
+     */
+    void saveAA_BatchProperty(@Param("map")Map<String,Object> map);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/mapper/xml/PurchaseWarehousingMapper.xml

@@ -13,28 +13,28 @@
     <insert id="saveRdRecord01One">
         INSERT INTO RdRecord01
         (
-          ID,
-          cVouchType,
-          cCode,
-          dDate,
-          cWhCode,
-          cOrderCode,
-          cARVCode,
-          cVenCode,
-          cDepCode,
-          cPersonCode,
-          dARVDate,
-          cBusType,
-          cPTCode,
-          cMemo,
-          cRdCode,
-          cDefine10,
-          bredvouch,<!--红蓝标识-->
-          bRdFlag,<!--收发标志-->
-          cSource,<!--单据来源-->
-          bTransFlag,<!--是否传递 -->
-          bIsSTQc,<!--是否传递 -->
-          cMaker,
+        ID,
+        cVouchType,
+        cCode,
+        dDate,
+        cWhCode,
+        cOrderCode,
+        cARVCode,
+        cVenCode,
+        cDepCode,
+        cPersonCode,
+        dARVDate,
+        cBusType,
+        cPTCode,
+        cMemo,
+        cRdCode,
+        cDefine10,
+        bredvouch,<!--红蓝标识-->
+        bRdFlag,<!--收发标志-->
+        cSource,<!--单据来源-->
+        bTransFlag,<!--是否传递 -->
+        bIsSTQc,<!--是否传递 -->
+        cMaker,
         dnmaketime,
         cHandler,
         dVeriDate,
@@ -43,55 +43,55 @@
         ipurorderid
         )
         VALUES
-            (
-                #{RdRecord01.ID},
-                '01',
-                #{RdRecord01.cCode},
-                #{RdRecord01.dDate},
-                #{RdRecord01.cWhCode},
-                #{RdRecord01.cOrderCode},
-                #{RdRecord01.cARVCode},
-                #{RdRecord01.cVenCode},
-                #{RdRecord01.cDepCode},
-                #{RdRecord01.cPersonCode},
-                #{RdRecord01.dARVDate},
-                #{RdRecord01.cBusType},
-                #{RdRecord01.cPTCode},
-                #{RdRecord01.cMemo},
-                #{RdRecord01.cRdCode},
-                #{RdRecord01.exportInvoiceNo},
-                #{RdRecord01.cVouchType},
-                1,
-                #{RdRecord01.cSource},
-                0,
-                0,
-                '陈创',
+        (
+        #{RdRecord01.ID},
+        '01',
+        #{RdRecord01.cCode},
+        #{RdRecord01.dDate},
+        #{RdRecord01.cWhCode},
+        #{RdRecord01.cOrderCode},
+        #{RdRecord01.cARVCode},
+        #{RdRecord01.cVenCode},
+        #{RdRecord01.cDepCode},
+        #{RdRecord01.cPersonCode},
+        #{RdRecord01.dARVDate},
+        #{RdRecord01.cBusType},
+        #{RdRecord01.cPTCode},
+        #{RdRecord01.cMemo},
+        #{RdRecord01.cRdCode},
+        #{RdRecord01.exportInvoiceNo},
+        #{RdRecord01.cVouchType},
+        1,
+        #{RdRecord01.cSource},
+        0,
+        0,
+        '陈创',
         CONVERT(varchar,GETDATE(),20),
-                '陈创',
+        '陈创',
         CONVERT(varchar,GETDATE(),23),
         CONVERT(varchar,GETDATE(),20),
         #{RdRecord01.cOrderCode},
         #{RdRecord01.ipurorderid}
         )
     </insert>
-    
+
     <insert id="saveRdrecords01One" parameterType="java.util.List">
         <foreach collection="list" item="item" index="index" separator=";">
-          INSERT INTO rdrecords01
+            INSERT INTO rdrecords01
             (
-              AutoID,
-              ID,
-              cDefine22,
-              cDefine28,
-              cInvCode,
-              iQuantity,
-              cBatch,
-              cFree1,
-              cDefine30,
-              cbMemo,
+            AutoID,
+            ID,
+            cDefine22,
+            cDefine28,
+            cInvCode,
+            iQuantity,
+            cBatch,
+            cFree1,
+            cDefine30,
+            cbMemo,
             iordercode,
-              irowno,
-              iFlag,<!--是否传递 -->
+            irowno,
+            iFlag,<!--是否传递 -->
             iMatSettleState,<!--结算状态 -->
             iBillSettleCount,<!--结算次数 -->
             iPOsID,
@@ -100,17 +100,17 @@
             )
             VALUES
             (
-              #{item.AutoID},
-              #{item.ID},
-              #{item.cDefine22},
-              #{item.cDefine28},
-              #{item.cInvCode},
-              #{item.iQuantity},
-              #{item.cBatch},
-              #{item.colour},
-              #{item.cDefine30},
-              #{item.cbMemo},
-              #{item.iordercode},
+            #{item.AutoID},
+            #{item.ID},
+            #{item.cDefine22},
+            #{item.cDefine28},
+            #{item.cInvCode},
+            #{item.iQuantity},
+            #{item.cBatch},
+            #{item.colour},
+            #{item.cDefine30},
+            #{item.cbMemo},
+            #{item.iordercode},
             #{item.irowno},
             0,
             0,
@@ -123,27 +123,27 @@
     </insert>
 
     <insert id="saveRdrecords01">
-            INSERT INTO rdrecords01
-            (
-            AutoID,
-            ID,
-            <!--cDefine22,
-            cDefine28,-->
-            cInvCode,
-            iQuantity,
-            cBatch,
-            <!--cFree1,-->
-            <!--cDefine30,-->
-            cbMemo,
-            iordercode,
-            irowno,
-            iFlag,<!--是否传递 -->
-            iMatSettleState,<!--结算状态 -->
-            iBillSettleCount,<!--结算次数 -->
-            iPOsID,
-            iOMoDID,
-            cPOID,
-            cDefine22,
+        INSERT INTO rdrecords01
+        (
+        AutoID,
+        ID,
+        <!--cDefine22,
+        cDefine28,-->
+        cInvCode,
+        iQuantity,
+        cBatch,
+        <!--cFree1,-->
+        <!--cDefine30,-->
+        cbMemo,
+        iordercode,
+        irowno,
+        iFlag,<!--是否传递 -->
+        iMatSettleState,<!--结算状态 -->
+        iBillSettleCount,<!--结算次数 -->
+        iPOsID,
+        iOMoDID,
+        cPOID,
+        cDefine22,
         cDefine23,
         cDefine24,
         cDefine25,
@@ -169,27 +169,27 @@
         cFree8,
         cFree9,
         cFree10
-            )
-            VALUES
-            (
-            #{map.AutoID},
-            #{map.ID},
-            <!--#{map.cDefine22},
-            #{map.cDefine28},-->
-            #{map.cInvCode},
-            #{map.iQuantity},
-            #{map.cBatch},
-           <!-- #{map.colour},-->
-           <!-- #{map.cDefine30},-->
-            #{map.cbMemo},
-            #{map.iordercode},
-            #{map.irowno},
-            0,
-            0,
-            0,
-            #{map.iPOsID},
-            #{map.iOMoDID},
-            #{map.cPOID},
+        )
+        VALUES
+        (
+        #{map.AutoID},
+        #{map.ID},
+        <!--#{map.cDefine22},
+        #{map.cDefine28},-->
+        #{map.cInvCode},
+        #{map.iQuantity},
+        #{map.cBatch},
+        <!-- #{map.colour},-->
+        <!-- #{map.cDefine30},-->
+        #{map.cbMemo},
+        #{map.iordercode},
+        #{map.irowno},
+        0,
+        0,
+        0,
+        #{map.iPOsID},
+        #{map.iOMoDID},
+        #{map.cPOID},
         #{map.cDefine22},
         #{map.cDefine23},
         #{map.cDefine24},
@@ -216,7 +216,7 @@
         #{map.cFree8},
         #{map.cFree9},
         #{map.cFree10}
-            )
+        )
     </insert>
 
     <insert id="savePurSettleVouch">
@@ -292,14 +292,14 @@
     </select>
 
     <select id="getRdrecords01WriteQuantity" resultType="java.util.HashMap" parameterType="java.lang.String">
-      SELECT SUM
-            ( rs.iQuantity ) - SUM ( rs.iSumBillQuantity )
+        SELECT SUM
+                   ( rs.iQuantity ) - SUM ( rs.iSumBillQuantity )
         FROM
             rdrecords01 rs
-            LEFT JOIN RdRecord01 r ON rs.ID= r.ID
+                LEFT JOIN RdRecord01 r ON rs.ID= r.ID
         WHERE
             r.bredvouch= 0
-            AND rs.iPOsID= #{rowmId}
+          AND rs.iPOsID= #{rowmId}
     </select>
 
     <select id="getPOPodetailsINatUnitPrice" parameterType="java.lang.String" resultType="java.util.HashMap">
@@ -321,6 +321,13 @@
         update OM_MODetails set iReceivedQTY=#{map.freceivedqty} where MODetailsID=#{map.ID}
     </update>
 
+    <select id="getPO_PomainBycPOID" parameterType="java.lang.String" resultType="java.util.HashMap">
+        select * from PO_Pomain where cPOID=#{cPOID}
+    </select>
+    <select id="getOM_MOmainBycCode" parameterType="java.lang.String" resultType="java.util.HashMap">
+        select * from OM_MOmain where cCode=#{cCode}
+    </select>
+
     <insert id="saveTransVouch">
         INSERT INTO TransVouch(ID,cTVCode,dTVDate,cODepCode,cIDepCode,cOWhCode,cIWhCode,cORdCode,cIRdCode,cMPoCode,cDefine13,
         cPersonCode,<!--业务员-->
@@ -429,7 +436,7 @@
         )
     </insert>
 
-<!--   新增其他出库单子表 -->
+    <!--   新增其他出库单子表 -->
     <insert id="saveRdRecords09">
         INSERT into RdRecords09(cInvCode,cBatch,iQuantity,cbMemo,AutoID,ID,iTrIds,cDefine22,iNQuantity
         ,cMassUnit,bLPUseFree,iRSRowNO,iOriTrackID,bCosting,bVMIUsed,iexpiratdatecalcu,iordertype,isotype,irowno)
@@ -456,7 +463,7 @@
         )
     </insert>
 
-<!--新增其他入库单主表-->
+    <!--新增其他入库单主表-->
     <insert id="saveRdRecord08">
         INSERT into RdRecord08 (cCode,dDate,cWhCode,cRdCode,cBusType,cBusCode,cPersonCode,cDepCode
         ,ID,bRdFlag,cVouchType,cSource,cHandler,bTransFlag,cMaker,dVeriDate,bpufirst,biafirst,VT_ID,bisSTQc,bOMFirst,bFromPreYear,bIsComplement,iDiscountTaxType,iBG_OverFlag,ControlResult,ireturncount
@@ -500,7 +507,7 @@
         )
     </insert>
 
-<!--  新增其他入库单子表  -->
+    <!--  新增其他入库单子表  -->
     <insert id="saveRdRecords08">
         INSERT into RdRecords08(cInvCode,cBatch,iQuantity,cbMemo,AutoID,ID,iTrIds,cDefine22,iNQuantity
         ,cMassUnit,bLPUseFree,iRSRowNO,iOriTrackID,bCosting,bVMIUsed,iexpiratdatecalcu,iordertype,isotype,irowno)
@@ -532,11 +539,116 @@
     </select>
 
     <select id="getOMMoDetails" parameterType="java.lang.String" resultType="java.util.HashMap">
-      select * from OM_MODetails where moDetailsId=#{moDetailsId}
+        select * from OM_MODetails where moDetailsId=#{moDetailsId}
     </select>
 
     <update id="updateVoucherHistoryCNumber" >
         update VoucherHistory set cNumber=#{cNumber} where CardNumber=#{cardNumber}
     </update>
 
+    <select id="getCurrentStockCount" resultType="java.lang.Integer" parameterType="java.util.HashMap">
+        SELECT COUNT
+                   ( * )
+        FROM
+            CurrentStock
+        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}
+    </select>
+
+    <update id="updateCurrentStock" parameterType="java.util.HashMap">
+        update CurrentStock set iQuantity=iQuantity+#{map.iQuantity}
+        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}
+    </update>
+
+    <select id="getAA_BatchPropertyCount" resultType="java.util.HashMap" parameterType="java.util.HashMap">
+        SELECT
+            *
+        FROM
+            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}
+    </select>
+
+    <update id="updateAA_BatchPropertyByID">
+        update AA_BatchProperty
+        set
+            cInvCode = #{map.cInvCode}
+          ,cBatch = #{map.cBatch}
+          ,cFree1 = #{map.cFree1}
+          ,cFree2 = #{map.cFree2}
+          ,cFree3 = #{map.cFree3}
+          ,cFree4 = #{map.cFree4}
+          ,cFree5 = #{map.cFree5}
+          ,cFree6 = #{map.cFree6}
+          ,cFree7 = #{map.cFree7}
+          ,cFree8 = #{map.cFree8}
+          ,cFree9 = #{map.cFree9}
+          ,cFree10 = #{map.cFree10}
+          ,cBatchProperty1=#{map.cBatchProperty1}
+          ,cBatchProperty8=#{map.cBatchProperty8}
+          ,cBatchProperty9=#{map.cBatchProperty9}
+        where cBatchPropertyGUID=#{map.cBatchPropertyGUID}
+    </update>
+
+    <insert id="saveAA_BatchProperty">
+        insert into AA_BatchProperty(
+            cInvCode,cBatch,cFree1,cFree2,cFree3,cFree4,cFree5,cFree6,cFree7,cFree8,cFree9,cFree10,cBatchProperty1,cBatchProperty8,cBatchProperty9,cBatchPropertyGUID
+        )
+        values
+            (
+                #{map.cInvCode},
+                #{map.cBatch},
+                #{map.cFree1},
+                #{map.cFree2},
+                #{map.cFree3},
+                #{map.cFree4},
+                #{map.cFree5},
+                #{map.cFree6},
+                #{map.cFree7},
+                #{map.cFree8},
+                #{map.cFree9},
+                #{map.cFree10},
+                #{map.cBatchProperty1},
+                #{map.cBatchProperty8},
+                #{map.cBatchProperty9},
+                #{map.cBatchPropertyGUID}
+            )
+    </insert>
+
 </mapper>

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

@@ -85,11 +85,25 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
                     map.put("cRdCode","11");
                     map.put("cPTCode","01");
                     map.put("cSource","采购订单");
+                    //获取汇率
+                    Map<String,Object> PO_PomainMap=this.baseMapper.getPO_PomainBycPOID(String.valueOf(map.get("cOrderCode")));
+                    if(PO_PomainMap!=null){
+                        map.put("iExchRate",getDecimalNew(String.valueOf(PO_PomainMap.get("nflat"))).doubleValue());
+                    }else{
+                        throw new RuntimeException("采购订单没有匹配的订单号");
+                    }
                 }else{
                     //委外入库
                     map.put("cRdCode","12");
                     map.put("cPTCode","01");
                     map.put("cSource","委外订单");
+                    //获取汇率
+                    Map<String,Object> OM_MOmainMap=this.baseMapper.getOM_MOmainBycCode(String.valueOf(map.get("cOrderCode")));
+                    if(OM_MOmainMap!=null){
+                        map.put("iExchRate",getDecimalNew(String.valueOf(OM_MOmainMap.get("nflat"))).doubleValue());
+                    }else{
+                        throw new RuntimeException("委外订单没有匹配的订单号");
+                    }
                 }
                 //获取部门编码
                 if(map.get("cPersonCode")!=null){
@@ -164,7 +178,16 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
                                         mapFreceivedqty.put("ID",rowmId);//订单行id
                                         //回写到采购订单对应行
                                         this.baseMapper.updatePodetailsfreceivedqty(mapFreceivedqty);
+                                        //回写到现存量
+                                        itemMap.put("cWhCode",map.get("cWhCode"));//获取仓库
+                                        Integer isCount= this.baseMapper.getCurrentStockCount(itemMap);
+                                        if(isCount!=null&&isCount>0){
+                                            //修改现存量
+                                            this.baseMapper.updateCurrentStock(itemMap);
+                                        }
                                     }
+                                    //新增AA_BatchProperty
+                                    message=message+saveAA_BatchProperty(map,itemMap,mapPOPodetails);
 
                                 }else{
                                     message=message+"第"+rowId+"未找到对应的采购订单行;";
@@ -195,7 +218,16 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
                                         mapFreceivedqty.put("ID",rowmId);//订单行id
                                         //回写到委外订单对应行
                                         this.baseMapper.updateOMMODetailsfreceivedqty(mapFreceivedqty);
+                                        //回写到现存量
+                                        itemMap.put("cWhCode",map.get("cWhCode"));//获取仓库
+                                        Integer isCount= this.baseMapper.getCurrentStockCount(itemMap);
+                                        if(isCount!=null&&isCount>0){
+                                            //修改现存量
+                                            this.baseMapper.updateCurrentStock(itemMap);
+                                        }
                                     }
+                                    //新增AA_BatchProperty
+                                    message=message+saveAA_BatchProperty(map,itemMap,mapOMMODetails);
                                 }else{
                                     message=message+"第"+rowId+"未找到对应的委外订单行;";
                                 }
@@ -241,6 +273,34 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
         }
     }
 
+    //新增AA_BatchProperty
+    public String saveAA_BatchProperty(Map<String,Object> map,Map<String,Object> itemMap,Map<String,Object> mapOMMODetails){
+        String message="";
+        //获取
+        BigDecimal iTaxPrice=getDecimalNew(String.valueOf(mapOMMODetails.get("iTaxPrice")));//原币含税单价
+        BigDecimal iExchRate=getDecimalNew(String.valueOf(map.get("iExchRate")));//汇率
+        BigDecimal unitPriceIncludingTax=iTaxPrice.multiply(iExchRate);//含税单价
+        itemMap.put("cBatchProperty1",unitPriceIncludingTax.doubleValue());//含税单价
+        itemMap.put("cBatchProperty8",map.get("cVenCode"));//供应商
+        itemMap.put("cBatchProperty9",map.get("cOrderCode"));//订单号
+        List<Map<String,Object>> listmap=this.baseMapper.getAA_BatchPropertyCount(itemMap);
+        //判断是否查询到数据
+        if(listmap!=null&&listmap.size()>0){
+            //修改
+            if(listmap.size()==1){
+                itemMap.put("cBatchPropertyGUID",listmap.get(0).get("cBatchPropertyGUID"));//ID
+                this.baseMapper.updateAA_BatchPropertyByID(itemMap);
+            }else{
+                message=message+"存货："+itemMap.get("cInvCode").toString()+"在AA_BatchProperty找到了多条记录";
+            }
+        }else{
+            //新增
+            itemMap.put("cBatchPropertyGUID",UUID.randomUUID().toString());//ID
+            this.baseMapper.saveAA_BatchProperty(itemMap);
+        }
+        return message;
+    }
+
     //获取采购订单行自定义项数据与存货自定义项数据
     public void getcFree(Map<String,Object> itemMap,Map<String,Object> mapPOPodetails){
         itemMap.put("cDefine22",setNull(mapPOPodetails.get("cDefine22")));

jeecg-boot-module-system/src/main/resources/application-test.yml

@@ -65,16 +65,16 @@ spring:
   jackson:
     date-format:   yyyy-MM-dd HH:mm:ss
     time-zone:   GMT+8
-  aop:
-    proxy-target-class: true
+  jpa:
+    open-in-view: false
   activiti:
     check-process-definitions: false
     #启用作业执行器
     async-executor-activate: false
     #启用异步执行器
     job-executor-activate: false
-  jpa:
-    open-in-view: false
+  aop:
+    proxy-target-class: true
   #配置freemarker
   freemarker:
     # 设置模板后缀名
@@ -118,7 +118,7 @@ spring:
         timeBetweenEvictionRunsMillis: 60000
         # 配置一个连接在池中最小生存的时间，单位是毫秒
         minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
+        validationQuery: SELECT 1
         testWhileIdle: true
         testOnBorrow: false
         testOnReturn: false
@@ -130,74 +130,75 @@ spring:
         # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
-          master:
-            url: jdbc:mysql://106.15.206.14:3306/sen_yu_dz_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-            username: root
-            password: CuiDian1234
-            driver-class-name: com.mysql.cj.jdbc.Driver
-          # 多数据源配置
-          #multi-datasource1:
-            #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-            #username: root
-            #password: root
-            #driver-class-name: com.mysql.cj.jdbc.Driver
+        master:
+          url: jdbc:mysql://106.15.206.14:3306/sen_yu_dz_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          username: root
+          password: CuiDian1234
+          driver-class-name: com.mysql.cj.jdbc.Driver
+        #多数据源配置
+        multi-one:
+          url: jdbc:sqlserver://106.15.32.1:1433;SelectMethod=cursor;DatabaseName=UFDATA
+          username: cuidian
+          password: cuidianUFdata
+          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
   #redis 配置
   redis:
-     database: 0
-     host: 127.0.0.1
-     lettuce:
-       pool:
-         max-active: 8   #最大连接数据库连接数,设 -1 为没有限制
-         max-idle: 8     #最大等待连接中的数量,设 0 为没有限制
-         max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
-         min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
-       shutdown-timeout: 100ms
-     password: ''
-     port: 6379
+    database: 0
+    host: 127.0.0.1
+    lettuce:
+      pool:
+        max-active: 8   #最大连接数据库连接数,设 -1 为没有限制
+        max-idle: 8     #最大等待连接中的数量,设 0 为没有限制
+        max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
+        min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
+      shutdown-timeout: 100ms
+    password: ''
+    port: 6379
 #mybatis plus 设置
 mybatis-plus:
-   mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
-   global-config:
+  mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
+  global-config:
     # 关闭MP3.0自带的banner
     banner: false
     db-config:
-      #主键类型
+      #主键类型  0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
       id-type: ASSIGN_ID
       # 默认数据库表下划线命名
       table-underline: true
-   configuration:
+  configuration:
     # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     # 返回类型为Map,显示null对应的字段
     call-setters-on-nulls: true
 #jeecg专用配置
 minidao :
   base-package: org.jeecg.modules.jmreport.*
+  #DB类型（mysql | postgresql | oracle | sqlserver| other）
+  db-type: mysql
 jeecg :
   # 是否启用安全模式
   safeMode: false
   # 签名密钥串(前后端要一致，正式发布请自行修改)
   signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
   # 本地：local\Minio：minio\阿里云：alioss
-  uploadType: local
+  uploadType: minio
   path :
     #文件上传根目录 设置
-    upload: D://opt//upFiles
+    upload: /opt/upFiles
     #webapp文件路径
-    webapp: D://opt//webapp
+    webapp: /opt/webapp
   shiro:
-     excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
+    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
   #阿里云oss存储和大鱼短信秘钥配置
   oss:
     accessKey: ??
     secretKey: ??
     endpoint: oss-cn-beijing.aliyuncs.com
     bucketName: jeecgdev
-    staticDomain: https://static.jeecg.com
-  # ElasticSearch 设置
+  # ElasticSearch 6设置
   elasticsearch:
     cluster-name: jeecg-ES
-    cluster-nodes: 81.70.47.128:9200
+    cluster-nodes: 127.0.0.1:9200
     check-enabled: false
   # 表单设计器配置
   desform:
@@ -209,20 +210,20 @@ jeecg :
       # 配置百度地图的AK，申请地址：https://lbs.baidu.com/apiconsole/key?application=key#/home
       baidu: ??
   # 在线预览文件服务器地址配置
-  file-view-domain: http://127.0.0.1:8012
+  file-view-domain: 127.0.0.1:8012
   # minio文件上传
   minio:
     minio_url: http://minio.jeecg.com
     minio_name: ??
     minio_pass: ??
-    bucketName: ??
+    bucketName: otatest
   #大屏报表参数设置
   jmreport:
-    mode: prod
+    mode: dev
     #数据字典是否进行saas数据隔离，自己看自己的字典
     saas: false
     #是否需要校验token
-    is_verify_token: false
+    is_verify_token: true
     #必须校验方法
     verify_methods: remove,delete,save,add,update
   #Wps在线文档
@@ -253,13 +254,13 @@ jeecg :
     password:
     type: STANDALONE
     enabled: true
-#Mybatis输出sql日志
-logging:
-  level:
-    org.jeecg.modules.system.mapper : info
 #cas单点登录
 cas:
   prefixUrl: http://cas.example.org:8443/cas
+#Mybatis输出sql日志
+logging:
+  level:
+    org.jeecg.modules.system.mapper : debug
 #swagger
 knife4j:
   #开启增强配置
@@ -267,7 +268,7 @@ knife4j:
   #开启生产环境屏蔽
   production: false
   basic:
-    enable: true
+    enable: false
     username: jeecg
     password: jeecg1314
 #第三方登录

jeecg-boot-module-system/target/classes/application-prod.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8090
+  port: 8001
   tomcat:
     max-swallow-size: -1
   error:
@@ -118,7 +118,7 @@ spring:
         timeBetweenEvictionRunsMillis: 60000
         # 配置一个连接在池中最小生存的时间，单位是毫秒
         minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
+#        validationQuery: SELECT 1 FROM DUAL
         testWhileIdle: true
         testOnBorrow: false
         testOnReturn: false
@@ -131,16 +131,42 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://127.0.0.1:3306/sen_yu_dz_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://106.15.206.14:3306/sen_yu_dz_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
-          password: CuiDian1234
+          password: root
           driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
-          #multi-datasource1:
-          #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-          #username: root
-          #password: root
-          #driver-class-name: com.mysql.cj.jdbc.Driver
+        multi-one:
+          url: jdbc:sqlserver://192.168.1.253;DatabaseName=UFDATA_901_2021
+          username: sa
+          password: Windows2008R2
+          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+        multi-two:
+          url: jdbc:sqlserver://192.168.1.253;DatabaseName=UFDATA_902_2021
+          username: sa
+          password: Windows2008R2
+          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+        multi-three:
+          url: jdbc:sqlserver://192.168.1.253;DatabaseName=UFDATA_903_2021
+          username: sa
+          password: Windows2008R2
+          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+#        multi-one:
+#          url: jdbc:sqlserver://192.168.1.18;DatabaseName=UFDATA_101_2021
+#          username: sa
+#          password: Windows2008R2
+#          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+#        multi-two:
+#          url: jdbc:sqlserver://192.168.1.18;DatabaseName=UFDATA_102_2021
+#          username: sa
+#          password: Windows2008R2
+#          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+#        multi-three:
+#          url: jdbc:sqlserver://192.168.1.18;DatabaseName=UFDATA_103_2021
+#          username: sa
+#          password: Windows2008R2
+#          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+
   #redis 配置
   redis:
     database: 0

jeecg-boot-module-system/target/classes/application-test.yml

@@ -65,16 +65,16 @@ spring:
   jackson:
     date-format:   yyyy-MM-dd HH:mm:ss
     time-zone:   GMT+8
-  aop:
-    proxy-target-class: true
+  jpa:
+    open-in-view: false
   activiti:
     check-process-definitions: false
     #启用作业执行器
     async-executor-activate: false
     #启用异步执行器
     job-executor-activate: false
-  jpa:
-    open-in-view: false
+  aop:
+    proxy-target-class: true
   #配置freemarker
   freemarker:
     # 设置模板后缀名
@@ -118,7 +118,7 @@ spring:
         timeBetweenEvictionRunsMillis: 60000
         # 配置一个连接在池中最小生存的时间，单位是毫秒
         minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
+        validationQuery: SELECT 1
         testWhileIdle: true
         testOnBorrow: false
         testOnReturn: false
@@ -130,74 +130,75 @@ spring:
         # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
-          master:
-            url: jdbc:mysql://106.15.206.14:3306/sen_yu_dz_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-            username: root
-            password: CuiDian1234
-            driver-class-name: com.mysql.cj.jdbc.Driver
-          # 多数据源配置
-          #multi-datasource1:
-            #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-            #username: root
-            #password: root
-            #driver-class-name: com.mysql.cj.jdbc.Driver
+        master:
+          url: jdbc:mysql://106.15.206.14:3306/sen_yu_dz_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          username: root
+          password: CuiDian1234
+          driver-class-name: com.mysql.cj.jdbc.Driver
+        #多数据源配置
+        multi-one:
+          url: jdbc:sqlserver://106.15.32.1:1433;SelectMethod=cursor;DatabaseName=UFDATA
+          username: cuidian
+          password: cuidianUFdata
+          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
   #redis 配置
   redis:
-     database: 0
-     host: 127.0.0.1
-     lettuce:
-       pool:
-         max-active: 8   #最大连接数据库连接数,设 -1 为没有限制
-         max-idle: 8     #最大等待连接中的数量,设 0 为没有限制
-         max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
-         min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
-       shutdown-timeout: 100ms
-     password: ''
-     port: 6379
+    database: 0
+    host: 127.0.0.1
+    lettuce:
+      pool:
+        max-active: 8   #最大连接数据库连接数,设 -1 为没有限制
+        max-idle: 8     #最大等待连接中的数量,设 0 为没有限制
+        max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
+        min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
+      shutdown-timeout: 100ms
+    password: ''
+    port: 6379
 #mybatis plus 设置
 mybatis-plus:
-   mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
-   global-config:
+  mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
+  global-config:
     # 关闭MP3.0自带的banner
     banner: false
     db-config:
-      #主键类型
+      #主键类型  0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
       id-type: ASSIGN_ID
       # 默认数据库表下划线命名
       table-underline: true
-   configuration:
+  configuration:
     # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     # 返回类型为Map,显示null对应的字段
     call-setters-on-nulls: true
 #jeecg专用配置
 minidao :
   base-package: org.jeecg.modules.jmreport.*
+  #DB类型（mysql | postgresql | oracle | sqlserver| other）
+  db-type: mysql
 jeecg :
   # 是否启用安全模式
   safeMode: false
   # 签名密钥串(前后端要一致，正式发布请自行修改)
   signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
   # 本地：local\Minio：minio\阿里云：alioss
-  uploadType: local
+  uploadType: minio
   path :
     #文件上传根目录 设置
-    upload: D://opt//upFiles
+    upload: /opt/upFiles
     #webapp文件路径
-    webapp: D://opt//webapp
+    webapp: /opt/webapp
   shiro:
-     excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
+    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
   #阿里云oss存储和大鱼短信秘钥配置
   oss:
     accessKey: ??
     secretKey: ??
     endpoint: oss-cn-beijing.aliyuncs.com
     bucketName: jeecgdev
-    staticDomain: https://static.jeecg.com
-  # ElasticSearch 设置
+  # ElasticSearch 6设置
   elasticsearch:
     cluster-name: jeecg-ES
-    cluster-nodes: 81.70.47.128:9200
+    cluster-nodes: 127.0.0.1:9200
     check-enabled: false
   # 表单设计器配置
   desform:
@@ -209,20 +210,20 @@ jeecg :
       # 配置百度地图的AK，申请地址：https://lbs.baidu.com/apiconsole/key?application=key#/home
       baidu: ??
   # 在线预览文件服务器地址配置
-  file-view-domain: http://127.0.0.1:8012
+  file-view-domain: 127.0.0.1:8012
   # minio文件上传
   minio:
     minio_url: http://minio.jeecg.com
     minio_name: ??
     minio_pass: ??
-    bucketName: ??
+    bucketName: otatest
   #大屏报表参数设置
   jmreport:
-    mode: prod
+    mode: dev
     #数据字典是否进行saas数据隔离，自己看自己的字典
     saas: false
     #是否需要校验token
-    is_verify_token: false
+    is_verify_token: true
     #必须校验方法
     verify_methods: remove,delete,save,add,update
   #Wps在线文档
@@ -253,13 +254,13 @@ jeecg :
     password:
     type: STANDALONE
     enabled: true
-#Mybatis输出sql日志
-logging:
-  level:
-    org.jeecg.modules.system.mapper : info
 #cas单点登录
 cas:
   prefixUrl: http://cas.example.org:8443/cas
+#Mybatis输出sql日志
+logging:
+  level:
+    org.jeecg.modules.system.mapper : debug
 #swagger
 knife4j:
   #开启增强配置
@@ -267,7 +268,7 @@ knife4j:
   #开启生产环境屏蔽
   production: false
   basic:
-    enable: true
+    enable: false
     username: jeecg
     password: jeecg1314
 #第三方登录

jeecg-boot-module-system/target/classes/application.yml

@@ -2,4 +2,4 @@ spring:
   application:
     name: jeecg-system
   profiles:
-    active: dev
+    active: test

jeecg-boot-module-system/target/classes/jeecg/jeecg_database.properties

@@ -1,9 +1,9 @@
 #mysql
 diver_name=com.mysql.jdbc.Driver
-url=jdbc:mysql://localhost:3306/sen_yu_dz_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+url=jdbc:mysql://106.15.206.14:3306/sen_yu_dz_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
 username=root
-password=root
-database_name=jeecg-boot
+password=CuiDian1234
+database_name=sen_yu_dz_dev
 
 #oracle
 #diver_name=oracle.jdbc.driver.OracleDriver

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

@@ -1,5 +1,654 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.demo.openApi.mapper.PurchaseWarehousingMapper">
+<mapper namespace="org.jeecg.modules.openApi.mapper.PurchaseWarehousingMapper">
+
+    <select id="getMaxId" resultType="java.lang.String">
+        select max(${id}) from ${tableName}
+    </select>
+
+    <select id="getMaxCode" resultType="java.lang.String">
+        select top 1 ${code} from ${tableName} ORDER BY dDate desc
+    </select>
+
+    <insert id="saveRdRecord01One">
+        INSERT INTO RdRecord01
+        (
+        ID,
+        cVouchType,
+        cCode,
+        dDate,
+        cWhCode,
+        cOrderCode,
+        cARVCode,
+        cVenCode,
+        cDepCode,
+        cPersonCode,
+        dARVDate,
+        cBusType,
+        cPTCode,
+        cMemo,
+        cRdCode,
+        cDefine10,
+        bredvouch,<!--红蓝标识-->
+        bRdFlag,<!--收发标志-->
+        cSource,<!--单据来源-->
+        bTransFlag,<!--是否传递 -->
+        bIsSTQc,<!--是否传递 -->
+        cMaker,
+        dnmaketime,
+        cHandler,
+        dVeriDate,
+        dnverifytime,
+        cDefine13,
+        ipurorderid
+        )
+        VALUES
+        (
+        #{RdRecord01.ID},
+        '01',
+        #{RdRecord01.cCode},
+        #{RdRecord01.dDate},
+        #{RdRecord01.cWhCode},
+        #{RdRecord01.cOrderCode},
+        #{RdRecord01.cARVCode},
+        #{RdRecord01.cVenCode},
+        #{RdRecord01.cDepCode},
+        #{RdRecord01.cPersonCode},
+        #{RdRecord01.dARVDate},
+        #{RdRecord01.cBusType},
+        #{RdRecord01.cPTCode},
+        #{RdRecord01.cMemo},
+        #{RdRecord01.cRdCode},
+        #{RdRecord01.exportInvoiceNo},
+        #{RdRecord01.cVouchType},
+        1,
+        #{RdRecord01.cSource},
+        0,
+        0,
+        '陈创',
+        CONVERT(varchar,GETDATE(),20),
+        '陈创',
+        CONVERT(varchar,GETDATE(),23),
+        CONVERT(varchar,GETDATE(),20),
+        #{RdRecord01.cOrderCode},
+        #{RdRecord01.ipurorderid}
+        )
+    </insert>
+
+    <insert id="saveRdrecords01One" parameterType="java.util.List">
+        <foreach collection="list" item="item" index="index" separator=";">
+            INSERT INTO rdrecords01
+            (
+            AutoID,
+            ID,
+            cDefine22,
+            cDefine28,
+            cInvCode,
+            iQuantity,
+            cBatch,
+            cFree1,
+            cDefine30,
+            cbMemo,
+            iordercode,
+            irowno,
+            iFlag,<!--是否传递 -->
+            iMatSettleState,<!--结算状态 -->
+            iBillSettleCount,<!--结算次数 -->
+            iPOsID,
+            iOMoDID,
+            cPOID
+            )
+            VALUES
+            (
+            #{item.AutoID},
+            #{item.ID},
+            #{item.cDefine22},
+            #{item.cDefine28},
+            #{item.cInvCode},
+            #{item.iQuantity},
+            #{item.cBatch},
+            #{item.colour},
+            #{item.cDefine30},
+            #{item.cbMemo},
+            #{item.iordercode},
+            #{item.irowno},
+            0,
+            0,
+            0,
+            #{item.iPOsID},
+            #{item.iOMoDID},
+            #{item.cPOID}
+            )
+        </foreach>
+    </insert>
+
+    <insert id="saveRdrecords01">
+        INSERT INTO rdrecords01
+        (
+        AutoID,
+        ID,
+        <!--cDefine22,
+        cDefine28,-->
+        cInvCode,
+        iQuantity,
+        cBatch,
+        <!--cFree1,-->
+        <!--cDefine30,-->
+        cbMemo,
+        iordercode,
+        irowno,
+        iFlag,<!--是否传递 -->
+        iMatSettleState,<!--结算状态 -->
+        iBillSettleCount,<!--结算次数 -->
+        iPOsID,
+        iOMoDID,
+        cPOID,
+        cDefine22,
+        cDefine23,
+        cDefine24,
+        cDefine25,
+        cDefine26,
+        cDefine27,
+        cDefine28,
+        cDefine29,
+        cDefine30,
+        cDefine31,
+        cDefine32,
+        cDefine33,
+        cDefine34,
+        cDefine35,
+        cDefine36,
+        cDefine37,
+        cFree1,
+        cFree2,
+        cFree3,
+        cFree4,
+        cFree5,
+        cFree6,
+        cFree7,
+        cFree8,
+        cFree9,
+        cFree10
+        )
+        VALUES
+        (
+        #{map.AutoID},
+        #{map.ID},
+        <!--#{map.cDefine22},
+        #{map.cDefine28},-->
+        #{map.cInvCode},
+        #{map.iQuantity},
+        #{map.cBatch},
+        <!-- #{map.colour},-->
+        <!-- #{map.cDefine30},-->
+        #{map.cbMemo},
+        #{map.iordercode},
+        #{map.irowno},
+        0,
+        0,
+        0,
+        #{map.iPOsID},
+        #{map.iOMoDID},
+        #{map.cPOID},
+        #{map.cDefine22},
+        #{map.cDefine23},
+        #{map.cDefine24},
+        #{map.cDefine25},
+        #{map.cDefine26},
+        #{map.cDefine27},
+        #{map.cDefine28},
+        #{map.cDefine29},
+        #{map.cDefine30},
+        #{map.cDefine31},
+        #{map.cDefine32},
+        #{map.cDefine33},
+        #{map.cDefine34},
+        #{map.cDefine35},
+        #{map.cDefine36},
+        #{map.cDefine37},
+        #{map.cFree1},
+        #{map.cFree2},
+        #{map.cFree3},
+        #{map.cFree4},
+        #{map.cFree5},
+        #{map.cFree6},
+        #{map.cFree7},
+        #{map.cFree8},
+        #{map.cFree9},
+        #{map.cFree10}
+        )
+    </insert>
+
+    <insert id="savePurSettleVouch">
+        INSERT INTO PurSettleVouch (
+        cSVCode,
+        dSVDate,
+        cBusType,
+        cVenCode,
+        cDepCode,
+        cPersonCode,
+        cPTCode,
+        iTaxRate,<!--税率-->
+        bFirst,
+        cMaker,
+        cSettleType,
+        iPrintCount,
+        bMerger,
+        PSVID<!--主键-->
+        )
+        VALUES (
+        #{map.cSVCode},
+        CONVERT(varchar,GETDATE(),20),
+        #{map.cBusType},
+        #{map.cVenCode},
+        #{map.cDepCode},
+        #{map.cPersonCode},
+        #{map.cPTCode},
+        #{map.iTaxRate},
+        0,
+        '陈创',
+        '01',
+        0,
+        0,
+        #{map.PSVID}
+        )
+    </insert>
+
+    <insert id="savePurSettleVouchs">
+        INSERT INTO PurSettleVouchs(
+        cPIVCode,
+        cInvCode,
+        iSVQuantity,<!--结算数量-->
+        iSVCost,<!--结算单价-->
+        iSVPrice,<!--结算金额-->
+        iSVACost,<!--暂估单价-->
+        iSVAPrice,<!--暂估金额-->
+        ID,
+        PSVID,
+        iRdsID,<!--蓝字入库单子表id-->
+        bAccount,
+        crdcvencode,<!--入库单供应商编码-->
+        cUpSoType,<!--入库单单据类型-->
+        )
+        VALUES(
+        #{map.cPIVCode},
+        #{map.cInvCode},
+        #{map.iSVQuantity},
+        #{map.iSVCost},
+        #{map.iSVPrice},
+        #{map.iSVACost},
+        #{map.iSVAPrice},
+        #{map.ID},
+        #{map.PSVID},
+        #{map.iRdsID},
+        0,
+        #{map.crdcvencode},
+        '01',
+        )
+    </insert>
+
+    <select id="getWhCodeByVenCode" parameterType="java.lang.String" resultType="java.util.HashMap">
+        select cVenCode,cVenDefine1,cVenDefine2,cVenAbbName from Vendor where cVenCode=#{cVenCode}
+    </select>
+
+    <select id="getRdrecords01WriteQuantity" resultType="java.util.HashMap" parameterType="java.lang.String">
+        SELECT SUM
+                   ( rs.iQuantity ) - SUM ( rs.iSumBillQuantity )
+        FROM
+            rdrecords01 rs
+                LEFT JOIN RdRecord01 r ON rs.ID= r.ID
+        WHERE
+            r.bredvouch= 0
+          AND rs.iPOsID= #{rowmId}
+    </select>
+
+    <select id="getPOPodetailsINatUnitPrice" parameterType="java.lang.String" resultType="java.util.HashMap">
+        select iNatUnitPrice,iPerTaxRate from PO_Podetails where ID=#{rowmId}
+    </select>
+
+    <select id="getPOPodetails" parameterType="java.lang.String" resultType="java.util.HashMap">
+        select * from PO_Podetails where ID=#{rowmId}
+    </select>
+
+    <update id="updatePodetailsfreceivedqty" parameterType="java.util.HashMap">
+        update PO_Podetails set freceivedqty=#{map.freceivedqty} where ID=#{map.ID}
+    </update>
+
+    <select id="getOMMODetails" parameterType="java.lang.String" resultType="java.util.HashMap">
+        select * from OM_MODetails where MODetailsID=#{rowmId}
+    </select>
+    <update id="updateOMMODetailsfreceivedqty" parameterType="java.util.HashMap">
+        update OM_MODetails set iReceivedQTY=#{map.freceivedqty} where MODetailsID=#{map.ID}
+    </update>
+
+    <select id="getPO_PomainBycPOID" parameterType="java.lang.String" resultType="java.util.HashMap">
+        select * from PO_Pomain where cPOID=#{cPOID}
+    </select>
+    <select id="getOM_MOmainBycCode" parameterType="java.lang.String" resultType="java.util.HashMap">
+        select * from OM_MOmain where cCode=#{cCode}
+    </select>
+
+    <insert id="saveTransVouch">
+        INSERT INTO TransVouch(ID,cTVCode,dTVDate,cODepCode,cIDepCode,cOWhCode,cIWhCode,cORdCode,cIRdCode,cMPoCode,cDefine13,
+        cPersonCode,<!--业务员-->
+        cMaker,<!--制单人专用接口用户-->
+        iNetLock,
+        VT_ID,
+        cVerifyPerson,<!--审核人 专用接口用户-->
+        iverifystate,<!--审核状态 为null-->
+        dVerifyDate,<!--审核日期-->
+        cPSPCode,<!--父级产品编码？-->
+        cOrderType,
+        csource,
+        itransflag,
+        dnmaketime,<!--制单日期-->
+        dnverifytime,<!--审核时间-->
+        iswfcontrolled,
+        iPrintCount
+        ) VALUES
+        (
+        #{map.ID},
+        #{map.cTVCode},
+        #{map.dTVDate},
+        null,
+        #{map.cIDepCode},
+        #{map.cOWhCode},
+        #{map.cIWhCode},
+        23,
+        13,
+        #{map.cMPoCode},
+        #{map.cDefine13},
+        #{map.cPersonCode},
+        '陈创',
+        0,
+        89,
+        '陈创',
+        null,
+        CONVERT(varchar,GETDATE(),23),
+        #{map.cPSPCode},
+        '委外订单',
+        1,
+        '正向',
+        CONVERT(varchar,GETDATE(),20),
+        CONVERT(varchar,GETDATE(),20),
+        0,
+        0
+        )
+    </insert>
+
+    <insert id="saveTransVouchs">
+        INSERT into TransVouchs(comcode,cDefine22,cTVBatch,cInvCode,iTVQuantity,cFree1,cFree2,cFree4,cFree6,cFree5,cDefine30,cbMemo,
+        cTVCode,autoID,ID,iSSodid,iDSoType,bCosting,invcode,iomids,iExpiratDateCalcu,irowno)
+        VALUES (#{map.comcode},#{map.cDefine22},#{map.cTVBatch},#{map.cInvCode},#{map.iTVQuantity},#{map.cFree1},#{map.cFree2},#{map.cFree4},#{map.cFree6},#{map.comcode},#{map.cFree5},#{map.cbMemo}
+        ,#{map.cTVCode}<!--库存调拨单号 主表单号-->
+        ,#{map.autoID}<!--子表id-->
+        ,#{map.ID}<!--主表id-->
+        ,0
+        ,0
+        ,1<!--是否核算?-->
+        ,#{map.invcode}<!--产品编码? 还有个字段叫存货编码 但是跟产品编码的值也不一样-->
+        ,#{map.iomids}<!--委外订单子件id ?需要跟云工厂确认是否会传-->
+        ,0
+        ,#{map.irowno}<!--行号-->
+        )
+    </insert>
+    <!--新增其他出库单主表-->
+    <insert id="saveRdRecord09">
+        INSERT into RdRecord09 (cCode,dDate,cWhCode,cRdCode,cBusType,cBusCode,cPersonCode,cDepCode
+        ,ID,bRdFlag,cVouchType,cSource,cHandler,bTransFlag,cMaker,dVeriDate,bpufirst,biafirst,VT_ID,bisSTQc,bOMFirst,bFromPreYear,bIsComplement,iDiscountTaxType,iBG_OverFlag,ControlResult,ireturncount
+        ,iverifystate,iswfcontrolled,dnmaketime,dnverifytime,bredvouch,cSourceLs,iPrintCount
+        )
+        VALUES (
+        #{map.cCode},
+        CONVERT(varchar,GETDATE(),23),
+        #{map.cWhCode},<!--调拨单的转出仓库-->
+        '23',
+        '调拨出库',
+        #{map.cBusCode},<!--调拨单号-->
+        #{map.cPersonCode},<!--业务员 调拨单业务员-->
+        #{map.cDepCode},<!--部门 调拨单转出部门-->
+        #{map.ID},
+        0,
+        '09',
+        '调拨',
+        '陈创',
+        0,
+        '陈创',
+        CONVERT(varchar,GETDATE(),23),
+        0,
+        0,
+        85,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        -1,
+        0,
+        0,
+        0,
+        CONVERT(varchar,GETDATE(),20),
+        CONVERT(varchar,GETDATE(),20),
+        #{map.bredvouch},<!--红蓝标识-->
+        1,
+        0
+        )
+    </insert>
+
+    <!--   新增其他出库单子表 -->
+    <insert id="saveRdRecords09">
+        INSERT into RdRecords09(cInvCode,cBatch,iQuantity,cbMemo,AutoID,ID,iTrIds,cDefine22,iNQuantity
+        ,cMassUnit,bLPUseFree,iRSRowNO,iOriTrackID,bCosting,bVMIUsed,iexpiratdatecalcu,iordertype,isotype,irowno)
+        VALUES(
+        #{map.cInvCode},
+        #{map.cBatch},
+        #{map.iQuantity},
+        #{map.cbMemo},
+        #{map.AutoID},
+        #{map.ID},
+        #{map.iTrIds},<!--调拨单子表标识-->
+        #{map.cDefine22},<!--款号-->
+        #{map.iNQuantity},<!--应收发数量-->
+        0,
+        0,
+        0,
+        0,
+        1,
+        0,
+        0,
+        0,
+        0,
+        #{map.irowno},<!--行号-->
+        )
+    </insert>
+
+    <!--新增其他入库单主表-->
+    <insert id="saveRdRecord08">
+        INSERT into RdRecord08 (cCode,dDate,cWhCode,cRdCode,cBusType,cBusCode,cPersonCode,cDepCode
+        ,ID,bRdFlag,cVouchType,cSource,cHandler,bTransFlag,cMaker,dVeriDate,bpufirst,biafirst,VT_ID,bisSTQc,bOMFirst,bFromPreYear,bIsComplement,iDiscountTaxType,iBG_OverFlag,ControlResult,ireturncount
+        ,iverifystate,iswfcontrolled,dnmaketime,dnverifytime,bredvouch,cSourceLs,iPrintCount
+        )
+        VALUES (
+        #{map.cCode},
+        CONVERT(varchar,GETDATE(),23),
+        #{map.cWhCode},<!--调拨单的转出仓库-->
+        '13',
+        '调拨入库',
+        #{map.cBusCode},<!--调拨单号-->
+        #{map.cPersonCode},<!--业务员 调拨单业务员-->
+        #{map.cDepCode},<!--部门 调拨单转出部门-->
+        #{map.ID},
+        0,
+        '08',
+        '调拨',
+        '陈创',
+        0,
+        '陈创',
+        CONVERT(varchar,GETDATE(),23),
+        0,
+        0,
+        85,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        -1,
+        0,
+        0,
+        0,
+        CONVERT(varchar,GETDATE(),20),
+        CONVERT(varchar,GETDATE(),20),
+        #{map.bredvouch},<!--红蓝标识-->
+        1,
+        0
+        )
+    </insert>
+
+    <!--  新增其他入库单子表  -->
+    <insert id="saveRdRecords08">
+        INSERT into RdRecords08(cInvCode,cBatch,iQuantity,cbMemo,AutoID,ID,iTrIds,cDefine22,iNQuantity
+        ,cMassUnit,bLPUseFree,iRSRowNO,iOriTrackID,bCosting,bVMIUsed,iexpiratdatecalcu,iordertype,isotype,irowno)
+        VALUES(
+        #{map.cInvCode},
+        #{map.cBatch},
+        #{map.iQuantity},
+        #{map.cbMemo},
+        #{map.AutoID},
+        #{map.ID},
+        #{map.iTrIds},<!--调拨单子表标识-->
+        #{map.cDefine22},<!--款号-->
+        #{map.iNQuantity},<!--应收发数量-->
+        0,
+        0,
+        0,
+        0,
+        1,
+        0,
+        0,
+        0,
+        0,
+        #{map.irowno},<!--行号-->
+        )
+    </insert>
+
+    <select id="getPerson" parameterType="java.lang.String" resultType="java.util.HashMap">
+        select * from Person where cPersonCode=#{cPersonCode}
+    </select>
+
+    <select id="getOMMoDetails" parameterType="java.lang.String" resultType="java.util.HashMap">
+        select * from OM_MODetails where moDetailsId=#{moDetailsId}
+    </select>
+
+    <update id="updateVoucherHistoryCNumber" >
+        update VoucherHistory set cNumber=#{cNumber} where CardNumber=#{cardNumber}
+    </update>
+
+    <select id="getCurrentStockCount" resultType="java.lang.Integer" parameterType="java.util.HashMap">
+        SELECT COUNT
+                   ( * )
+        FROM
+            CurrentStock
+        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}
+    </select>
+
+    <update id="updateCurrentStock" parameterType="java.util.HashMap">
+        update CurrentStock set iQuantity=iQuantity+#{map.iQuantity}
+        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}
+    </update>
+
+    <select id="getAA_BatchPropertyCount" resultType="java.util.HashMap" parameterType="java.util.HashMap">
+        SELECT
+            *
+        FROM
+            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}
+    </select>
+
+    <update id="updateAA_BatchPropertyByID">
+        update AA_BatchProperty
+        set
+            cInvCode = #{map.cInvCode}
+          ,cBatch = #{map.cBatch}
+          ,cFree1 = #{map.cFree1}
+          ,cFree2 = #{map.cFree2}
+          ,cFree3 = #{map.cFree3}
+          ,cFree4 = #{map.cFree4}
+          ,cFree5 = #{map.cFree5}
+          ,cFree6 = #{map.cFree6}
+          ,cFree7 = #{map.cFree7}
+          ,cFree8 = #{map.cFree8}
+          ,cFree9 = #{map.cFree9}
+          ,cFree10 = #{map.cFree10}
+          ,cBatchProperty1=#{map.cBatchProperty1}
+          ,cBatchProperty8=#{map.cBatchProperty8}
+          ,cBatchProperty9=#{map.cBatchProperty9}
+        where cBatchPropertyGUID=#{map.cBatchPropertyGUID}
+    </update>
+
+    <insert id="saveAA_BatchProperty">
+        insert into AA_BatchProperty(
+            cInvCode,cBatch,cFree1,cFree2,cFree3,cFree4,cFree5,cFree6,cFree7,cFree8,cFree9,cFree10,cBatchProperty1,cBatchProperty8,cBatchProperty9,cBatchPropertyGUID
+        )
+        values
+            (
+                #{map.cInvCode},
+                #{map.cBatch},
+                #{map.cFree1},
+                #{map.cFree2},
+                #{map.cFree3},
+                #{map.cFree4},
+                #{map.cFree5},
+                #{map.cFree6},
+                #{map.cFree7},
+                #{map.cFree8},
+                #{map.cFree9},
+                #{map.cFree10},
+                #{map.cBatchProperty1},
+                #{map.cBatchProperty8},
+                #{map.cBatchProperty9},
+                #{map.cBatchPropertyGUID}
+            )
+    </insert>
 
 </mapper>