浏览代码

采购入库

Administrator 2 年之前
父节点
当前提交
d9ffe9473e

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

@@ -83,6 +83,12 @@ public interface PurchaseWarehousingMapper extends BaseMapper<PurchaseWarehousin
     */
     void saveTransVouch(@Param("map")Map<String,Object> map);
 
+    /**
+     * 新增调拨单子表
+     * @param map
+     */
+    void saveTransVouchs(@Param("map")Map<String,Object> map);
+
     /**
     * @Author chenchuang
     * @Description //TODO 根据红字获取对应采购订单行的蓝字根据入库数量与发票数量判断是否需要做结算单的数量

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

@@ -365,6 +365,23 @@
         )
     </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>
+
     <select id="getPerson" parameterType="java.lang.String" resultType="java.util.HashMap">
         select * from Person where cPersonCode=#{cPersonCode}
     </select>

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

@@ -325,6 +325,7 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
         transVouchMao.put("ID",oConvertUtils.addOne(getMaxId("ID","TransVouch")));
         //获取最大编码
         transVouchMao.put("cTVCode",oConvertUtils.addOne(getMaxId("cTVCode","TransVouch")));
+        //修改最大编码
         this.baseMapper.updateVoucherHistoryCNumber(oConvertUtils.maxNumber(String.valueOf(transVouchMao.get("cTVCode"))),"0304");
         //单据日期
         Date date=new Date();
@@ -373,13 +374,21 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
                 vouchsMap.put("cTVBatch",recordsMap.get("cBatch"));//批号
                 vouchsMap.put("cInvCode",recordsMap.get("cInvCode"));//存货编码
                 vouchsMap.put("iTVQuantity",recordsMap.get("iQuantity"));//数量
-                vouchsMap.put("cFree1",recordsMap.get(""));//颜色
-                vouchsMap.put("cFree2",recordsMap.get(""));//尺码
-                vouchsMap.put("cFree4",recordsMap.get(""));//光坯门幅
-                vouchsMap.put("cFree6",recordsMap.get(""));//克重/工艺
-                vouchsMap.put("cFree5",recordsMap.get(""));//品质/品种
-                vouchsMap.put("cDefine30",recordsMap.get(""));//染厂色号
-                vouchsMap.put("cbMemo",recordsMap.get(""));//备注
+                vouchsMap.put("cFree1",recordsMap.get("cFree1"));//颜色
+                vouchsMap.put("cFree2",recordsMap.get("cFree2"));//尺码
+                vouchsMap.put("cFree4",recordsMap.get("cFree4"));//光坯门幅
+                vouchsMap.put("cFree6",recordsMap.get("cFree6"));//克重/工艺
+                vouchsMap.put("cFree5",recordsMap.get("cFree5"));//品质/品种
+                vouchsMap.put("cDefine30",recordsMap.get("cDefine30"));//染厂色号
+                vouchsMap.put("cbMemo",recordsMap.get("cbMemo"));//备注
+                vouchsMap.put("cTVCode",transVouchMao.get("cTVCode"));//主表调拨单号
+                vouchsMap.put("autoID", oConvertUtils.addOne(getMaxId("autoID","TransVouchs")));//子表id
+                vouchsMap.put("ID",transVouchMao.get("ID"));//主表ID
+                vouchsMap.put("invcode",recordsMap.get(""));//产品编码
+                vouchsMap.put("iomids",recordsMap.get(""));//委外订单自件id
+                vouchsMap.put("irowno",recordsMap.get("irowno"));//行号
+                this.baseMapper.saveTransVouchs(vouchsMap);
+                transVouchsList.add(vouchsMap);
             }
         }
     }