From 9804bdb2b70ab01cd422845dfaa0d2d7bbd98758 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 17 五月 2025 15:23:41 +0800
Subject: [PATCH] 接口编写

---
 src/main/java/com/zy/nc/vo/ic_generalout_h.java                      |  859 ++++++++++++++++
 src/main/java/com/zy/asrs/service/OrderService.java                  |    2 
 src/main/java/com/zy/nc/vo/ic_generalout_b.java                      |    4 
 src/main/java/com/zy/asrs/entity/Order.java                          |    6 
 src/main/java/com/zy/nc/vo/WhsTransBillHeaderVO.java                 |  207 +++
 src/main/java/com/zy/nc/vo/ic_purchasein_h.java                      |  300 +++++
 src/main/java/com/zy/nc/vo/ic_purchasein_b.java                      |  297 +++++
 src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java |  285 ++++
 src/main/java/com/zy/nc/vo/GeneralInHeadVO.java                      |  205 +++
 src/main/java/com/zy/nc/vo/WhsTransBillBodyVO.java                   |  337 ++++++
 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java         |    5 
 src/main/java/com/zy/asrs/mapper/OrderMapper.java                    |    3 
 src/main/resources/mapper/asrs/OrderMapper.xml                       |   12 
 src/main/java/com/zy/nc/vo/GeneralInBodyVO.java                      |  617 +++++++++++
 14 files changed, 3,091 insertions(+), 48 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/Order.java b/src/main/java/com/zy/asrs/entity/Order.java
index 90aac1d..02db03f 100644
--- a/src/main/java/com/zy/asrs/entity/Order.java
+++ b/src/main/java/com/zy/asrs/entity/Order.java
@@ -221,6 +221,12 @@
     private Long settle;
 
     /**
+     * 姝ュ簭
+     */
+    @ApiModelProperty(value= "姝ュ簭")
+    private Integer step;
+
+    /**
      * 鐘舵�� 1: 姝ｅ父  0: 绂佺敤
      */
     @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父  0: 绂佺敤  ")
diff --git a/src/main/java/com/zy/asrs/mapper/OrderMapper.java b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
index 69f50ce..aa54685 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
@@ -14,6 +14,9 @@
 
     int updateSettle(@Param("orderId")Long orderId, @Param("settle")Long settle, @Param("userId")Long userId);
 
+    int updateSettleStep(@Param("orderId")Long orderId, @Param("settle")Long settle, @Param("userId")Long userId, @Param("step")Integer step);
+
+
     List<Order> selectComplete();
     List<Order> selectComplete1();
     List<Order> selectComplete99();
diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java
index 878002f..632ea83 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -18,6 +18,8 @@
 
     boolean updateSettle(Long orderId, Long settle, Long userId);
 
+    boolean updateSettleStep(Long orderId, Long settle, Long userId, Integer step);
+
     void checkComplete(String orderNo);
 
     boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls);
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index ba05f58..7a688cd 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -66,6 +66,11 @@
     }
 
     @Override
+    public boolean updateSettleStep(Long orderId, Long settle, Long userId, Integer step) {
+        return this.baseMapper.updateSettleStep(orderId, settle, userId,step) > 0;
+    }
+
+    @Override
     public void checkComplete(String orderNo) {
         Order order = this.selectByNo(orderNo);
         if (Cools.isEmpty(order) || order.getSettle() >= 4L) {
diff --git a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
index 68a15ae..f46ee1b 100644
--- a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
@@ -10,12 +10,10 @@
 import com.zy.asrs.service.ApiLogService;
 import com.zy.asrs.service.OrderService;
 import com.zy.asrs.service.ReportToThirdService;
-import com.zy.common.utils.Synchro;
 import com.zy.nc.SendUtil;
 import com.zy.nc.entity.NccSaleXsfhmxWms;
 import com.zy.nc.util.NcResultMessage;
-import com.zy.nc.vo.SaleOutBodyVO;
-import com.zy.nc.vo.SaleOutHeadVO;
+import com.zy.nc.vo.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -48,65 +46,101 @@
 
     @Override
     public void report(Order order, List<OrderDetl> orderDetls, DocType docType) {
-        Boolean http = false;
+        int step = (Cools.isEmpty(order.getStep()) || order.getStep() == 0) ? 0 : order.getStep();
         NcResultMessage response = null;
+        Object process1 = null;
+        Object process2 = null;
+        Object process3 = null;
         try {
-            switch (order.getDocType().toString()) {
-                case "35":
-                    //缁勮瀵硅薄鏁版嵁
-                    Map<String, Object> data = new HashMap<String, Object>();
-                    SaleOutHeadVO saleOutHeadVO = new SaleOutHeadVO();
-                    saleOutHeadVO.setPk_org("FYT");
-                    saleOutHeadVO.setCwarehouseid("6101");
-                    SaleOutBodyVO saleOutBodyVO = null;
-                    List<SaleOutBodyVO> saleOutBodyVOList = new ArrayList<>();
-                    for (OrderDetl orderDetl : orderDetls) {
-                        saleOutBodyVO = new SaleOutBodyVO();
-                        String remark = orderDetl.getRemark();
-                        if (!Cools.isEmpty(remark)) {
-                            NccSaleXsfhmxWms nccSaleXsfhmxWms = JSONObject.parseObject(remark, NccSaleXsfhmxWms.class);
-                            saleOutBodyVO.setCsourcetype("4331");
-                            saleOutBodyVO.setClocationid("610101");
-                            saleOutBodyVO.setCsourcebillbid(nccSaleXsfhmxWms.getCdeliverybid());
-                            saleOutBodyVO.setCsourcebillhid(nccSaleXsfhmxWms.getCdeliveryid());
-                            saleOutHeadVO.setVdef2(nccSaleXsfhmxWms.getVdef2());
-                            saleOutHeadVO.setVdef3(nccSaleXsfhmxWms.getVdef3());
-                            saleOutHeadVO.setVdef4(nccSaleXsfhmxWms.getVdef4());
-                            saleOutHeadVO.setVdef7(nccSaleXsfhmxWms.getVdef7());
-                            saleOutHeadVO.setVdef8(nccSaleXsfhmxWms.getVdef8());
-                            saleOutHeadVO.setVdef13(nccSaleXsfhmxWms.getVdef13());
-                            saleOutHeadVO.setVdef14(nccSaleXsfhmxWms.getVdef14());
-                        }
-                        saleOutBodyVO.setVbatchcode(orderDetl.getBatch());
-                        saleOutBodyVO.setNshouldnum(orderDetl.getAnfme());
-                        saleOutBodyVO.setNnum(orderDetl.getQty());
-                        saleOutBodyVOList.add(saleOutBodyVO);
-                    }
-                    data.put("SaleOutHeadVO", saleOutHeadVO);
-                    data.put("SaleOutBodyVO", saleOutBodyVOList);
+            switch (order.getDocType$().toString()) {
+                case "閿�鍞彂璐�":
+                    process1 = processXSFH(orderDetls);
                     //鍙戦�佽姹�
-                    response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, saveRefDelivery, JSONObject.toJSONString(data));
+                    response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, saveRefDelivery, JSONObject.toJSONString(process1));
                     if (!Cools.isEmpty(response) && response.isSuccess()) {
                         log.info("response:{}", response);
-                        http = true;
+                        step = 10;
                     }
                     break;
-                case "浜ф垚鍝佸叆搴�":
+                case "杞簱":
+                    process1 = processQTRK(orderDetls);
+                    //鍙戦�佽姹�
+                    response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, saveRefDelivery, JSONObject.toJSONString(process1));
+                    if (!Cools.isEmpty(response) && response.isSuccess()) {
+                        log.info("response:{}", response);
+                        step = 10;
+                    }
                     break;
-                case "杈呮枡閲囪喘鍏ュ簱":
+                case "閲囪喘鍒拌揣":
+                    process1 = processCGDH(orderDetls);
+                    //鍙戦�佽姹�
+                    response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, saveRefDelivery, JSONObject.toJSONString(process1));
+                    if (!Cools.isEmpty(response) && response.isSuccess()) {
+                        log.info("response:{}", response);
+                        step = 10;
+                    }
                     break;
-                case "杈呮枡鍙婃垚鍝佽浆搴�":
+                case "浜ф垚鍝佸叆搴撳崟":
+                    if (step == 2) {
+                        process3 = processQTRK(orderDetls);
+                        //鍙戦�佽姹�
+                        response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, saveRefDelivery, JSONObject.toJSONString(process3));
+                        if (!Cools.isEmpty(response) && response.isSuccess()) {
+                            log.info("response:{}", response);
+                            step = 10;
+                        }
+                    } else if (step == 1) {
+                        process2 = processGENERALOUT(orderDetls);
+                        //鍙戦�佽姹�
+                        response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, saveRefDelivery, JSONObject.toJSONString(process2));
+                        if (!Cools.isEmpty(response) && response.isSuccess()) {
+                            log.info("response:{}", response);
+                            step = 2;
+                        }
+                        process3 = processQTRK(orderDetls);
+                        //鍙戦�佽姹�
+                        response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, saveRefDelivery, JSONObject.toJSONString(process3));
+                        if (!Cools.isEmpty(response) && response.isSuccess()) {
+                            log.info("response:{}", response);
+                            step = 10;
+                        }
+                    } else if (step == 0) {
+                        process1 = processZK(orderDetls);
+                        //鍙戦�佽姹�
+                        response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, saveRefDelivery, JSONObject.toJSONString(process1));
+                        if (!Cools.isEmpty(response) && response.isSuccess()) {
+                            log.info("response:{}", response);
+                            step = 1;
+                        }
+                        process2 = processGENERALOUT(orderDetls);
+                        //鍙戦�佽姹�
+                        response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, saveRefDelivery, JSONObject.toJSONString(process2));
+                        if (!Cools.isEmpty(response) && response.isSuccess()) {
+                            log.info("response:{}", response);
+                            step = 2;
+                        }
+                        process3 = processQTRK(orderDetls);
+                        //鍙戦�佽姹�
+                        response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, saveRefDelivery, JSONObject.toJSONString(process3));
+                        if (!Cools.isEmpty(response) && response.isSuccess()) {
+                            log.info("response:{}", response);
+                            step = 10;
+                        }
+                    }
                     break;
-                case "鑷姩鍖呰鍏ュ簱":
-                    break;
-                case "鍐呴儴璋冩嫧":
-                    break;
+//                case "鍐呴儴璋冩嫧":
+//                    break;
                 default:
-                    break;
+                    throw new CoolException("涓嶈兘璇嗗埆鐨勫崟鎹被鍨�");
             }
-            if (http) {
+            if (step == 10) {
                 // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
                 if (!orderService.updateSettle(order.getId(), 6L, null)) {
+                    throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+                }
+            } else if (step != 0) {
+                // 淇敼璁㈠崟鐘舵�� 鍋氭爣璁�
+                if (!orderService.updateSettleStep(order.getId(), 6L, null, step)) {
                     throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
                 }
             }
@@ -119,6 +153,161 @@
 
     }
 
+
+    private Object processXSFH(List<OrderDetl> orderDetls) {
+        //缁勮瀵硅薄鏁版嵁
+        Map<String, Object> data = new HashMap<String, Object>();
+        SaleOutHeadVO saleOutHeadVO = new SaleOutHeadVO();
+        saleOutHeadVO.setPk_org("FYT");
+        saleOutHeadVO.setCwarehouseid("6101");
+        SaleOutBodyVO saleOutBodyVO = null;
+        List<SaleOutBodyVO> saleOutBodyVOList = new ArrayList<>();
+        for (OrderDetl orderDetl : orderDetls) {
+            saleOutBodyVO = new SaleOutBodyVO();
+            String remark = orderDetl.getRemark();
+            if (!Cools.isEmpty(remark)) {
+                NccSaleXsfhmxWms nccSaleXsfhmxWms = JSONObject.parseObject(remark, NccSaleXsfhmxWms.class);
+                saleOutBodyVO.setCsourcetype("4331");
+                saleOutBodyVO.setClocationid("610101");
+                saleOutBodyVO.setCsourcebillbid(nccSaleXsfhmxWms.getCdeliverybid());
+                saleOutBodyVO.setCsourcebillhid(nccSaleXsfhmxWms.getCdeliveryid());
+                saleOutHeadVO.setVdef2(nccSaleXsfhmxWms.getVdef2());
+                saleOutHeadVO.setVdef3(nccSaleXsfhmxWms.getVdef3());
+                saleOutHeadVO.setVdef4(nccSaleXsfhmxWms.getVdef4());
+                saleOutHeadVO.setVdef7(nccSaleXsfhmxWms.getVdef7());
+                saleOutHeadVO.setVdef8(nccSaleXsfhmxWms.getVdef8());
+                saleOutHeadVO.setVdef13(nccSaleXsfhmxWms.getVdef13());
+                saleOutHeadVO.setVdef14(nccSaleXsfhmxWms.getVdef14());
+            }
+            saleOutBodyVO.setVbatchcode(orderDetl.getBatch());
+            saleOutBodyVO.setNshouldnum(orderDetl.getAnfme());
+            saleOutBodyVO.setNnum(orderDetl.getQty());
+            saleOutBodyVOList.add(saleOutBodyVO);
+        }
+        data.put("SaleOutHeadVO", saleOutHeadVO);
+        data.put("SaleOutBodyVO", saleOutBodyVOList);
+        return data;
+    }
+
+
+    private Object processQTRK(List<OrderDetl> orderDetls) {
+        //缁勮瀵硅薄鏁版嵁
+        Map<String, Object> data = new HashMap<String, Object>();
+        GeneralInHeadVO generalInHeadVO = new GeneralInHeadVO();
+        generalInHeadVO.setPk_org("FYT");
+        generalInHeadVO.setCwarehouseid("6101");
+        GeneralInBodyVO generalInBodyVO = null;
+        List<GeneralInBodyVO> generalInBodyVOS = new ArrayList<>();
+        for (OrderDetl orderDetl : orderDetls) {
+            generalInBodyVO = new GeneralInBodyVO();
+            String remark = orderDetl.getRemark();
+            if (!Cools.isEmpty(remark)) {
+                NccSaleXsfhmxWms nccSaleXsfhmxWms = JSONObject.parseObject(remark, NccSaleXsfhmxWms.class);
+                generalInBodyVO.setCsourcetype("4331");
+                generalInBodyVO.setClocationid("610101");
+                generalInBodyVO.setCsourcebillbid(nccSaleXsfhmxWms.getCdeliverybid());
+                generalInBodyVO.setCsourcebillhid(nccSaleXsfhmxWms.getCdeliveryid());
+                generalInBodyVO.setNnum(orderDetl.getQty());
+                generalInBodyVO.setVbatchcode(orderDetl.getBatch());
+                generalInBodyVO.setCmaterialoid(orderDetl.getMatnr());
+            }
+            generalInBodyVOS.add(generalInBodyVO);
+        }
+        data.put("GeneralInHeadVO", generalInHeadVO);
+        data.put("GeneralInBodyVO", generalInBodyVOS);
+        return data;
+    }
+
+
+    private Object processZK(List<OrderDetl> orderDetls) {
+        //缁勮瀵硅薄鏁版嵁
+        Map<String, Object> data = new HashMap<String, Object>();
+        WhsTransBillHeaderVO whsTransBillHeaderVO = new WhsTransBillHeaderVO();
+        whsTransBillHeaderVO.setPk_org("FYT");
+        whsTransBillHeaderVO.setCwarehouseid("6101");
+        WhsTransBillBodyVO whsTransBillBodyVO = null;
+        List<WhsTransBillBodyVO> whsTransBillBodyVOS = new ArrayList<>();
+        for (OrderDetl orderDetl : orderDetls) {
+            whsTransBillBodyVO = new WhsTransBillBodyVO();
+            String remark = orderDetl.getRemark();
+            if (!Cools.isEmpty(remark)) {
+                NccSaleXsfhmxWms nccSaleXsfhmxWms = JSONObject.parseObject(remark, NccSaleXsfhmxWms.class);
+                whsTransBillBodyVO.setCsourcetype("4331");
+                whsTransBillBodyVO.setClocationid("610101");
+                whsTransBillBodyVO.setCsourcebillbid(nccSaleXsfhmxWms.getCdeliverybid());
+                whsTransBillBodyVO.setCsourcebillhid(nccSaleXsfhmxWms.getCdeliveryid());
+                whsTransBillBodyVO.setNnum(orderDetl.getQty());
+                whsTransBillBodyVO.setVbatchcode(orderDetl.getBatch());
+                whsTransBillBodyVO.setCmaterialoid(orderDetl.getMatnr());
+            }
+            whsTransBillBodyVOS.add(whsTransBillBodyVO);
+        }
+        data.put("WhsTransBillHeaderVO", whsTransBillHeaderVO);
+        data.put("WhsTransBillBodyVO", whsTransBillBodyVOS);
+        return data;
+    }
+
+    private Object processCGDH(List<OrderDetl> orderDetls) {
+        //缁勮瀵硅薄鏁版嵁
+        Map<String, Object> data = new HashMap<String, Object>();
+        ic_purchasein_h ic_purchasein_h = new ic_purchasein_h();
+        ic_purchasein_h.setPk_org("FYT");
+        ic_purchasein_h.setCwarehouseid("6101");
+        ic_purchasein_b ic_purchasein_b = null;
+        List<ic_purchasein_b> ic_purchasein_bs = new ArrayList<>();
+        for (OrderDetl orderDetl : orderDetls) {
+            ic_purchasein_b = new ic_purchasein_b();
+            String remark = orderDetl.getRemark();
+            if (!Cools.isEmpty(remark)) {
+                NccSaleXsfhmxWms nccSaleXsfhmxWms = JSONObject.parseObject(remark, NccSaleXsfhmxWms.class);
+                ic_purchasein_b.setVdef2(nccSaleXsfhmxWms.getVdef2());
+                ic_purchasein_b.setVdef3(nccSaleXsfhmxWms.getVdef3());
+                ic_purchasein_b.setVdef4(nccSaleXsfhmxWms.getVdef4());
+                ic_purchasein_b.setVdef7(nccSaleXsfhmxWms.getVdef7());
+                ic_purchasein_b.setVdef8(nccSaleXsfhmxWms.getVdef8());
+                ic_purchasein_b.setVdef13(nccSaleXsfhmxWms.getVdef13());
+                ic_purchasein_b.setVdef14(nccSaleXsfhmxWms.getVdef14());
+            }
+            ic_purchasein_bs.add(ic_purchasein_b);
+        }
+        data.put("ic_purchasein_h", ic_purchasein_h);
+        data.put("ic_purchasein_b", ic_purchasein_b);
+        return data;
+    }
+
+    /**
+     * @param orderDetls
+     * @return
+     */
+    private Object processGENERALOUT(List<OrderDetl> orderDetls) {
+        //缁勮瀵硅薄鏁版嵁
+        Map<String, Object> data = new HashMap<String, Object>();
+        ic_purchasein_h ic_purchasein_h = new ic_purchasein_h();
+        ic_purchasein_h.setPk_org("FYT");
+        ic_purchasein_h.setCwarehouseid("6101");
+        ic_purchasein_b ic_purchasein_b = null;
+        List<ic_purchasein_b> ic_purchasein_bs = new ArrayList<>();
+        for (OrderDetl orderDetl : orderDetls) {
+            ic_purchasein_b = new ic_purchasein_b();
+            String remark = orderDetl.getRemark();
+            if (!Cools.isEmpty(remark)) {
+                NccSaleXsfhmxWms nccSaleXsfhmxWms = JSONObject.parseObject(remark, NccSaleXsfhmxWms.class);
+                ic_purchasein_b.setVdef2(nccSaleXsfhmxWms.getVdef2());
+                ic_purchasein_b.setVdef3(nccSaleXsfhmxWms.getVdef3());
+                ic_purchasein_b.setVdef4(nccSaleXsfhmxWms.getVdef4());
+                ic_purchasein_b.setVdef7(nccSaleXsfhmxWms.getVdef7());
+                ic_purchasein_b.setVdef8(nccSaleXsfhmxWms.getVdef8());
+                ic_purchasein_b.setVdef13(nccSaleXsfhmxWms.getVdef13());
+                ic_purchasein_b.setVdef14(nccSaleXsfhmxWms.getVdef14());
+            }
+            ic_purchasein_bs.add(ic_purchasein_b);
+        }
+        data.put("ic_purchasein_h", ic_purchasein_h);
+        data.put("ic_purchasein_b", ic_purchasein_b);
+        return data;
+    }
+
+
     private Boolean reportApiLog(Object data, String docType, String url, String path) {
         String response = "";
         boolean success = false;
diff --git a/src/main/java/com/zy/nc/vo/GeneralInBodyVO.java b/src/main/java/com/zy/nc/vo/GeneralInBodyVO.java
new file mode 100644
index 0000000..719f636
--- /dev/null
+++ b/src/main/java/com/zy/nc/vo/GeneralInBodyVO.java
@@ -0,0 +1,617 @@
+package com.zy.nc.vo;
+
+import lombok.Data;
+
+/**
+ * 鍏ュ簱鍗曡〃浣撳疄浣撶被
+ */
+@Data
+public class GeneralInBodyVO {
+
+
+    /**
+     * 鏉ユ簮鍗曟嵁琛ㄤ綋涓婚敭锛堝繀濉級
+     */
+    private String csourcebillbid;
+
+    /**
+     * 鏉ユ簮鍗曟嵁涓婚敭锛堝繀濉級
+     */
+    private String csourcebillhid;
+
+    /**
+     * 鏉ユ簮鍗曟嵁绫诲瀷锛堝繀濉級
+     */
+    private String csourcetype;
+
+    /**
+     * 瀹炴敹涓绘暟閲忥紙蹇呭～锛�
+     */
+    private Double nnum;
+
+    /**
+     * 搴旀敹涓绘暟閲忥紙蹇呭～锛�
+     */
+    private Double nshouldnum;
+
+    /**
+     * 鍗曟嵁琛屾槸鍚︽潯鐮佸叧闂�
+     */
+    private Boolean bbarcodeclose;
+
+    /**
+     * 鎵规鏄惁灏佸瓨
+     */
+    private Boolean bcseal;
+
+    /**
+     * 鏄惁宸蹭紶瀛樿揣鏍哥畻
+     */
+    private Boolean bhasiabill;
+
+    /**
+     * 鏄惁鍦ㄩ��
+     */
+    private Boolean bonroadflag;
+
+    /**
+     * 瀹㈡埛
+     */
+    private String casscustid;
+
+    /**
+     * 鍗曚綅
+     */
+    private String castunitid;
+
+    /**
+     * 鍑哄叆搴撶被鍨�
+     */
+    private String cbodytranstypecode;
+
+    /**
+     * 搴撳瓨浠撳簱
+     */
+    private String cbodywarehouseid;
+
+    /**
+     * 瀵瑰簲鍏ュ簱鍗曡〃浣撲富閿�
+     */
+    private String ccorrespondbid;
+
+    /**
+     * 瀵瑰簲鍏ュ簱鍗曞崟鎹彿
+     */
+    private String ccorrespondcode;
+
+    /**
+     * 瀵瑰簲鍏ュ簱鍗曚富閿�
+     */
+    private String ccorrespondhid;
+
+    /**
+     * 瀵瑰簲鍏ュ簱鍗曡鍙�
+     */
+    private String ccorrespondrowno;
+
+    /**
+     * 瀵瑰簲鍏ュ簱鍗曚氦鏄撶被鍨�
+     */
+    private String ccorrespondtranstype;
+
+    /**
+     * 瀵瑰簲鍏ュ簱鍗曠被鍨�
+     */
+    private String ccorrespondtype;
+
+    /**
+     * 鐗瑰緛鐮�
+     */
+    private String cffileid;
+
+    /**
+     * 婧愬ご鍗曟嵁琛ㄤ綋涓婚敭
+     */
+    private String cfirstbillbid;
+
+    /**
+     * 婧愬ご鍗曟嵁琛ㄥご涓婚敭
+     */
+    private String cfirstbillhid;
+
+    /**
+     * 婧愬ご鍗曟嵁浜ゆ槗绫诲瀷
+     */
+    private String cfirsttranstype;
+
+    /**
+     * 婧愬ご鍗曟嵁绫诲瀷
+     */
+    private String cfirsttype;
+
+    /**
+     * 鍏ュ簱鍗曡〃浣撲富閿�
+     */
+    private String cgeneralbid;
+
+    /**
+     * 鍏ュ簱鍒╂鼎涓績
+     */
+    private String cliabilityoid;
+
+    /**
+     * 鍏ュ簱鍒╂鼎涓績
+     */
+    private String cliabilityvid;
+
+    /**
+     * 璐т綅
+     */
+    private String clocationid;
+
+    /**
+     * 鐗╂枡
+     */
+    private String cmaterialoid;
+
+    /**
+     * 鐗╂枡缂栫爜
+     */
+    private String cmaterialvid;
+
+    /**
+     * 鍏徃鏈�鏂扮増鏈�
+     */
+    private String corpoid;
+
+    /**
+     * 鍏徃
+     */
+    private String corpvid;
+
+    /**
+     * 鐢熶骇鍘傚晢
+     */
+    private String cproductorid;
+
+    /**
+     * 椤圭洰
+     */
+    private String cprojectid;
+
+    /**
+     * 璐ㄩ噺绛夌骇
+     */
+    private String cqualitylevelid;
+
+    /**
+     * 琛屽彿
+     */
+    private String crowno;
+
+    /**
+     * 閫夋嫨鎷嗚В鍗曚綅
+     */
+    private String cselastunitid;
+
+    /**
+     * 搴忓垪鍙疯川閲忕瓑绾�
+     */
+    private String csnqualitylevelid;
+
+    /**
+     * 搴忓垪鍙峰崟浣�
+     */
+    private String csnunitid;
+
+    /**
+     * 鏉ユ簮鍗曟嵁浜ゆ槗绫诲瀷
+     */
+    private String csourcetranstype;
+
+    /**
+     * 鍏朵粬鏉ユ簮鍗曡涓婚敭
+     */
+    private String csrc2billbid;
+
+    /**
+     * 鍏朵粬鏉ユ簮鍗曚富閿�
+     */
+    private String csrc2billhid;
+
+    /**
+     * 鍏朵粬鏉ユ簮鍗曟嵁绫诲瀷缂栫爜
+     */
+    private String csrc2billtype;
+
+    /**
+     * 鍏朵粬鏉ユ簮浜ゆ槗绫诲瀷缂栫爜
+     */
+    private String csrc2transtype;
+
+    /**
+     * 搴撳瓨鐘舵��
+     */
+    private String cstateid;
+
+    /**
+     * 璐т富瀹㈡埛
+     */
+    private String ctplcustomerid;
+
+    /**
+     * 涓诲崟浣�
+     */
+    private String cunitid;
+
+    /**
+     * 渚涘簲鍟�
+     */
+    private String cvendorid;
+
+    /**
+     * 瀵勫瓨渚涘簲鍟�
+     */
+    private String cvmivenderid;
+
+    /**
+     * 鍏ュ簱鏃ユ湡
+     */
+    private String dbizdate;
+
+    /**
+     * 棣栨鍏ュ簱鏃ユ湡
+     */
+    private String dinbounddate;
+
+    /**
+     * 鐢熶骇鏃ユ湡
+     */
+    private String dproducedate;
+
+    /**
+     * 澶辨晥鏃ユ湡
+     */
+    private String dvalidate;
+
+    /**
+     * 鎵规鐗堟湰鍙�
+     */
+    private Integer ibcversion;
+
+    /**
+     * 鎷嗚В绫诲瀷
+     */
+    private Integer idesatype;
+
+    /**
+     * 瀹炴敹鏁伴噺
+     */
+    private Double nassistnum;
+
+    /**
+     * 鏉＄爜涓绘暟閲�
+     */
+    private Double nbarcodenum;
+
+    /**
+     * 绱鍑哄簱鏁伴噺
+     */
+    private Double ncorrespondastnum;
+
+    /**
+     * 绱鍑哄簱姣涢噸涓绘暟閲�
+     */
+    private Double ncorrespondgrsnum;
+
+    /**
+     * 绱鍑哄簱涓绘暟閲�
+     */
+    private Double ncorrespondnum;
+
+    /**
+     * 閲戦
+     */
+    private Double ncostmny;
+
+    /**
+     * 鍗曚环
+     */
+    private Double ncostprice;
+
+    /**
+     * 绠辨暟
+     */
+    private Double ncountnum;
+
+    /**
+     * 璐圭敤缁撶畻娆℃暟
+     */
+    private Integer nfeesettlecount;
+
+    /**
+     * 姣涢噸涓绘暟閲�
+     */
+    private Double ngrossnum;
+
+    /**
+     * 浠舵暟
+     */
+    private Double npiece;
+
+    /**
+     * 璁″垝閲戦
+     */
+    private Double nplannedmny;
+
+    /**
+     * 璁″垝鍗曚环
+     */
+    private Double nplannedprice;
+
+    /**
+     * 搴旀敹鏁伴噺
+     */
+    private Double nshouldassistnum;
+
+    /**
+     * 鐨噸涓绘暟閲�
+     */
+    private Double ntarenum;
+
+    /**
+     * 绱鎷ｉ厤涓绘暟閲�
+     */
+    private Double ntotalpicknum;
+
+    /**
+     * 浣撶Н
+     */
+    private Double nvolume;
+
+    /**
+     * 閲嶉噺
+     */
+    private Double nweight;
+
+    /**
+     * 鎵规涓婚敭
+     */
+    private String pk_batchcode;
+
+    /**
+     * 闆嗗洟
+     */
+    private String pk_group;
+
+    /**
+     * 璁￠噺鍣ㄥ叿
+     */
+    private String pk_measware;
+
+    /**
+     * 搴撳瓨缁勭粐鏈�鏂扮増鏈�
+     */
+    private String pk_org;
+
+    /**
+     * 搴撳瓨缁勭粐
+     */
+    private String pk_org_v;
+
+    /**
+     * 鍖呰绫诲瀷
+     */
+    private String pk_packsort;
+
+    /**
+     * 搴忓垪鍙蜂富閿�
+     */
+    private String pk_serialcode;
+
+    /**
+     * 鎵规鏃堕棿鎴�
+     */
+    private String tbcts;
+
+    /**
+     * 妫�楠屾椂闂�
+     */
+    private String tchecktime;
+
+    /**
+     * 鏉ユ簮琛ㄤ綋鏃堕棿鎴�
+     */
+    private String tsourcebodyts;
+
+    /**
+     * 鏉ユ簮琛ㄥご鏃堕棿鎴�
+     */
+    private String tsourceheadts;
+
+    /**
+     * 鎵规鍙�
+     */
+    private String vbatchcode;
+
+    /**
+     * 鎵规澶囨敞
+     */
+    private String vbatchcodenote;
+
+    // 鎵规鑷畾涔夐」锛坴bcdef1 - vbcdef20锛�
+    private String vbcdef1;
+    private String vbcdef2;
+    private String vbcdef3;
+    private String vbcdef4;
+    private String vbcdef5;
+    private String vbcdef6;
+    private String vbcdef7;
+    private String vbcdef8;
+    private String vbcdef9;
+    private String vbcdef10;
+    private String vbcdef11;
+    private String vbcdef12;
+    private String vbcdef13;
+    private String vbcdef14;
+    private String vbcdef15;
+    private String vbcdef16;
+    private String vbcdef17;
+    private String vbcdef18;
+    private String vbcdef19;
+    private String vbcdef20;
+
+    // 琛ㄤ綋鑷畾涔夐」锛坴bdef1 - vbdef20锛�
+    private String vbdef1;
+    private String vbdef2;
+    private String vbdef3;
+    private String vbdef4;
+    private String vbdef5;
+    private String vbdef6;
+    private String vbdef7;
+    private String vbdef8;
+    private String vbdef9;
+    private String vbdef10;
+    private String vbdef11;
+    private String vbdef12;
+    private String vbdef13;
+    private String vbdef14;
+    private String vbdef15;
+    private String vbdef16;
+    private String vbdef17;
+    private String vbdef18;
+    private String vbdef19;
+    private String vbdef20;
+
+    /**
+     * 鍗曟嵁鏉＄爜
+     */
+    private String vbillbarcode;
+
+    /**
+     * 鏉ヨ嚜浜庨浂鍞箣鍗曟嵁绫诲瀷
+     */
+    private String vbilltypeu8rm;
+
+    /**
+     * 鎹㈢畻鐜�
+     */
+    private String vchangerate;
+
+    /**
+     * 婧愬ご鍗曟嵁鍙�
+     */
+    private String vfirstbillcode;
+
+    /**
+     * 婧愬ご鍗曟嵁琛屽彿
+     */
+    private String vfirstrowno;
+
+    // 鑷敱杈呭姪灞炴�э紙vfree1 - vfree10锛�
+    private String vfree1;
+    private String vfree2;
+    private String vfree3;
+    private String vfree4;
+    private String vfree5;
+    private String vfree6;
+    private String vfree7;
+    private String vfree8;
+    private String vfree9;
+    private String vfree10;
+
+    /**
+     * 琛屽娉�
+     */
+    private String vnotebody;
+
+    /**
+     * 搴忓垪鍙�
+     */
+    private String vserialcode;
+
+    // 搴忓垪鍙疯嚜瀹氫箟椤癸紙vsndef1 - vsndef40锛�
+    private String vsndef1;
+    private String vsndef2;
+    private String vsndef3;
+    private String vsndef4;
+    private String vsndef5;
+    private String vsndef6;
+    private String vsndef7;
+    private String vsndef8;
+    private String vsndef9;
+    private String vsndef10;
+    private String vsndef11;
+    private String vsndef12;
+    private String vsndef13;
+    private String vsndef14;
+    private String vsndef15;
+    private String vsndef16;
+    private String vsndef17;
+    private String vsndef18;
+    private String vsndef19;
+    private String vsndef20;
+    private String vsndef21;
+    private String vsndef22;
+    private String vsndef23;
+    private String vsndef24;
+    private String vsndef25;
+    private String vsndef26;
+    private String vsndef27;
+    private String vsndef28;
+    private String vsndef29;
+    private String vsndef30;
+    private String vsndef31;
+    private String vsndef32;
+    private String vsndef33;
+    private String vsndef34;
+    private String vsndef35;
+    private String vsndef36;
+    private String vsndef37;
+    private String vsndef38;
+    private String vsndef39;
+    private String vsndef40;
+
+    /**
+     * 鏉ユ簮鍗曟嵁鍙�
+     */
+    private String vsourcebillcode;
+
+    /**
+     * 鏉ユ簮鍗曟嵁琛屽彿
+     */
+    private String vsourcerowno;
+
+    /**
+     * 鍏朵粬鏉ユ簮鍗曟嵁鍙�
+     */
+    private String vsrc2billcode;
+
+    /**
+     * 鍏朵粬鏉ユ簮鍗曡鍙�
+     */
+    private String vsrc2billrowno;
+
+    /**
+     * 鏀惰揣杞﹀彿
+     */
+    private String vtransfercode;
+
+    /**
+     * 鏉ヨ嚜浜庨浂鍞箣浜ゆ槗绫诲瀷
+     */
+    private String vtranstypeu8rm;
+
+    /**
+     * 杩愯緭宸ュ叿鍙�
+     */
+    private String vvehiclecode;
+
+    /**
+     * 渚涘簲鍟嗘壒娆″彿
+     */
+    private String vvendbatchcode;
+}
+
+
+
diff --git a/src/main/java/com/zy/nc/vo/GeneralInHeadVO.java b/src/main/java/com/zy/nc/vo/GeneralInHeadVO.java
new file mode 100644
index 0000000..c47a8c7
--- /dev/null
+++ b/src/main/java/com/zy/nc/vo/GeneralInHeadVO.java
@@ -0,0 +1,205 @@
+package com.zy.nc.vo;
+
+import lombok.Data;
+
+/**
+ * 鍏ュ簱鍗曞疄浣撶被
+ */
+@Data
+public class GeneralInHeadVO {
+
+
+    /**
+     * 搴撳瓨缁勭粐鏈�鏂扮増鏈紙蹇呭～锛�
+     */
+    private String pk_org;
+
+    /**
+     * 浠撳簱锛堝繀濉級
+     */
+    private String cwarehouseid;
+
+    /**
+     * 绛惧瓧浜�
+     */
+    private String approver;
+
+    /**
+     * 鍒跺崟浜�
+     */
+    private String billmaker;
+
+    /**
+     * 涓氬姟鍛�
+     */
+    private String cbizid;
+
+    /**
+     * 閮ㄩ棬鏈�鏂扮増鏈�
+     */
+    private String cdptid;
+
+    /**
+     * 閮ㄩ棬
+     */
+    private String cdptvid;
+
+    /**
+     * 鍏ュ簱鍗曡〃澶翠富閿�
+     */
+    private String cgeneralhid;
+
+    /**
+     * 鍏徃鏈�鏂扮増鏈�
+     */
+    private String corpoid;
+
+    /**
+     * 鍏徃
+     */
+    private String corpvid;
+
+    /**
+     * 鍑哄簱搴撳瓨缁勭粐
+     */
+    private String cothercalbodyoid;
+
+    /**
+     * 鍑哄簱搴撳瓨缁勭粐鐗堟湰
+     */
+    private String cothercalbodyvid;
+
+    /**
+     * 鍑哄簱浠撳簱
+     */
+    private String cotherwhid;
+
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    private String creationtime;
+
+    /**
+     * 鍒涘缓浜�
+     */
+    private String creator;
+
+    /**
+     * 鍑哄叆搴撶被鍨�
+     */
+    private String ctrantypeid;
+
+    /**
+     * 搴撶鍛�
+     */
+    private String cwhsmanagerid;
+
+    /**
+     * 鍗曟嵁鏃ユ湡
+     */
+    private String dbilldate;
+
+    /**
+     * 鍒跺崟鏃ユ湡
+     */
+    private String dmakedate;
+
+    /**
+     * 鍗曟嵁鐘舵��
+     */
+    private Integer fbillflag;
+
+    /**
+     * 鎵撳嵃娆℃暟
+     */
+    private Integer iprintcount;
+
+    /**
+     * 鏈�鍚庝慨鏀规椂闂�
+     */
+    private String modifiedtime;
+
+    /**
+     * 鏈�鍚庝慨鏀逛汉
+     */
+    private String modifier;
+
+    /**
+     * 鎬绘暟閲�
+     */
+    private Double ntotalnum;
+
+    /**
+     * 鎬讳欢鏁�
+     */
+    private Double ntotalpiece;
+
+    /**
+     * 鎬讳綋绉�
+     */
+    private Double ntotalvolume;
+
+    /**
+     * 鎬婚噸閲�
+     */
+    private Double ntotalweight;
+
+    /**
+     * 闆嗗洟
+     */
+    private String pk_group;
+
+    /**
+     * 璁￠噺鍣ㄥ叿
+     */
+    private String pk_measware;
+
+    /**
+     * 搴撳瓨缁勭粐
+     */
+    private String pk_org_v;
+
+    /**
+     * 绛惧瓧鏃ユ湡
+     */
+    private String taudittime;
+
+    /**
+     * 鍗曟嵁鍙�
+     */
+    private String vbillcode;
+
+    // 琛ㄥご鑷畾涔夐」锛坴def1 - vdef20锛�
+    private String vdef1;
+    private String vdef2;
+    private String vdef3;
+    private String vdef4;
+    private String vdef5;
+    private String vdef6;
+    private String vdef7;
+    private String vdef8;
+    private String vdef9;
+    private String vdef10;
+    private String vdef11;
+    private String vdef12;
+    private String vdef13;
+    private String vdef14;
+    private String vdef15;
+    private String vdef16;
+    private String vdef17;
+    private String vdef18;
+    private String vdef19;
+    private String vdef20;
+
+    /**
+     * 澶囨敞
+     */
+    private String vnote;
+
+    /**
+     * 鍑哄叆搴撶被鍨嬬紪鐮�
+     */
+    private String vtrantypecode;
+
+
+}
diff --git a/src/main/java/com/zy/nc/vo/WhsTransBillBodyVO.java b/src/main/java/com/zy/nc/vo/WhsTransBillBodyVO.java
new file mode 100644
index 0000000..0432420
--- /dev/null
+++ b/src/main/java/com/zy/nc/vo/WhsTransBillBodyVO.java
@@ -0,0 +1,337 @@
+package com.zy.nc.vo;
+
+import lombok.Data;
+
+/**
+ * 杞簱鍗曡〃浣撳疄浣撶被
+ */
+@Data
+public class WhsTransBillBodyVO {
+
+
+    /**
+     * 瀹㈡埛
+     */
+    private String casscustid;
+
+    /**
+     * 鍗曚綅
+     */
+    private String castunitid;
+
+    /**
+     * 搴撳瓨浠撳簱
+     */
+    private String cbodywarehouseid;
+
+    /**
+     * 鐗瑰緛鐮�
+     */
+    private String cffileid;
+
+    /**
+     * 婧愬ご鍗曟嵁琛ㄤ綋
+     */
+    private String cfirstbillbid;
+
+    /**
+     * 婧愬ご鍗曟嵁琛ㄥご
+     */
+    private String cfirstbillhid;
+
+    /**
+     * 婧愬ご浜ゆ槗绫诲瀷
+     */
+    private String cfirsttranstype;
+
+    /**
+     * 婧愬ご鍗曟嵁绫诲瀷
+     */
+    private String cfirsttype;
+
+    /**
+     * 璐т綅
+     */
+    private String clocationid;
+
+    /**
+     * 鐗╂枡锛堝繀濉級
+     */
+    private String cmaterialoid;
+
+    /**
+     * 鐗╂枡缂栫爜
+     */
+    private String cmaterialvid;
+
+    /**
+     * 鍏徃鏈�鏂扮増鏈�
+     */
+    private String corpoid;
+
+    /**
+     * 鍏徃
+     */
+    private String corpvid;
+
+    /**
+     * 鐢熶骇鍘傚晢
+     */
+    private String cproductorid;
+
+    /**
+     * 椤圭洰
+     */
+    private String cprojectid;
+
+    /**
+     * 璐ㄩ噺绛夌骇
+     */
+    private String cqualitylevelid;
+
+    /**
+     * 琛屽彿
+     */
+    private String crowno;
+
+    /**
+     * 鏉ユ簮鍗曟嵁琛ㄤ綋琛屼富閿�
+     */
+    private String csourcebillbid;
+
+    /**
+     * 鏉ユ簮鍗曟嵁琛ㄥご涓婚敭
+     */
+    private String csourcebillhid;
+
+    /**
+     * 鏉ユ簮浜ゆ槗绫诲瀷
+     */
+    private String csourcetranstype;
+
+    /**
+     * 鏉ユ簮鍗曟嵁绫诲瀷
+     */
+    private String csourcetype;
+
+    /**
+     * 杞簱鍗曡〃浣撲富閿�
+     */
+    private String cspecialbid;
+
+    /**
+     * 搴撳瓨鐘舵��
+     */
+    private String cstateid;
+
+    /**
+     * 璐т富瀹㈡埛
+     */
+    private String ctplcustomerid;
+
+    /**
+     * 涓诲崟浣�
+     */
+    private String cunitid;
+
+    /**
+     * 渚涘簲鍟�
+     */
+    private String cvendorid;
+
+    /**
+     * 瀵勫瓨渚涘簲鍟�
+     */
+    private String cvmivenderid;
+
+    /**
+     * 鐢熶骇鏃ユ湡
+     */
+    private String dproducedate;
+
+    /**
+     * 澶辨晥鏃ユ湡
+     */
+    private String dvalidate;
+
+    /**
+     * 搴旇浆鏁伴噺
+     */
+    private Double nassistnum;
+
+    /**
+     * 閲戦
+     */
+    private Double ncostmny;
+
+    /**
+     * 鍗曚环
+     */
+    private Double ncostprice;
+
+    /**
+     * 搴旇浆鍑烘瘺閲嶆暟閲�
+     */
+    private Double ngrossnum;
+
+    /**
+     * 搴旇浆涓绘暟閲忥紙蹇呭～锛�
+     */
+    private Double nnum;
+
+    /**
+     * 鍦ㄩ�斾富鏁伴噺
+     */
+    private Double nonroadnum;
+
+    /**
+     * 绱鍏ュ簱姣涢噸鏁伴噺
+     */
+    private Double ntransingrossnum;
+
+    /**
+     * 绱鍏ュ簱涓绘暟閲�
+     */
+    private Double ntransinnum;
+
+    /**
+     * 绱鍑哄簱姣涢噸鏁伴噺
+     */
+    private Double ntransoutgrossnum;
+
+    /**
+     * 绱鍑哄簱涓绘暟閲�
+     */
+    private Double ntransoutnum;
+
+    /**
+     * 鎵规涓婚敭
+     */
+    private String pk_batchcode;
+
+    /**
+     * 闆嗗洟
+     */
+    private String pk_group;
+
+    /**
+     * 搴撳瓨缁勭粐鏈�鏂扮増鏈�
+     */
+    private String pk_org;
+
+    /**
+     * 搴撳瓨缁勭粐
+     */
+    private String pk_org_v;
+
+    /**
+     * 妫�楠屾椂闂�
+     */
+    private String tchecktime;
+
+    /**
+     * 鎵规鍙�
+     */
+    private String vbatchcode;
+
+    /**
+     * 鎵规澶囨敞
+     */
+    private String vbatchcodenote;
+
+    // 鎵规鑷畾涔夐」锛坴bcdef1 - vbcdef20锛�
+    private String vbcdef1;
+    private String vbcdef2;
+    private String vbcdef3;
+    private String vbcdef4;
+    private String vbcdef5;
+    private String vbcdef6;
+    private String vbcdef7;
+    private String vbcdef8;
+    private String vbcdef9;
+    private String vbcdef10;
+    private String vbcdef11;
+    private String vbcdef12;
+    private String vbcdef13;
+    private String vbcdef14;
+    private String vbcdef15;
+    private String vbcdef16;
+    private String vbcdef17;
+    private String vbcdef18;
+    private String vbcdef19;
+    private String vbcdef20;
+
+    // 琛ㄤ綋鑷畾涔夐」锛坴bdef1 - vbdef20锛�
+    private String vbdef1;
+    private String vbdef2;
+    private String vbdef3;
+    private String vbdef4;
+    private String vbdef5;
+    private String vbdef6;
+    private String vbdef7;
+    private String vbdef8;
+    private String vbdef9;
+    private String vbdef10;
+    private String vbdef11;
+    private String vbdef12;
+    private String vbdef13;
+    private String vbdef14;
+    private String vbdef15;
+    private String vbdef16;
+    private String vbdef17;
+    private String vbdef18;
+    private String vbdef19;
+    private String vbdef20;
+
+    /**
+     * 鎹㈢畻鐜�
+     */
+    private String vchangerate;
+
+    /**
+     * 婧愬ご鍗曟嵁鍙�
+     */
+    private String vfirstbillcode;
+
+    /**
+     * 婧愬ご鍗曟嵁琛屽彿
+     */
+    private String vfirstrowno;
+
+    // 鑷敱杈呭姪灞炴�э紙vfree1 - vfree10锛�
+    private String vfree1;
+    private String vfree2;
+    private String vfree3;
+    private String vfree4;
+    private String vfree5;
+    private String vfree6;
+    private String vfree7;
+    private String vfree8;
+    private String vfree9;
+    private String vfree10;
+
+    /**
+     * 琛屽娉�
+     */
+    private String vnotebody;
+
+    /**
+     * 鏉ユ簮鍗曟嵁鍙�
+     */
+    private String vsourcebillcode;
+
+    /**
+     * 鏉ユ簮鍗曟嵁琛屽彿
+     */
+    private String vsourcerowno;
+
+    /**
+     * 渚涘簲鍟嗘壒娆″彿
+     */
+    private String vvendorbatchcode;
+
+    // 浠ヤ笅涓篻etter鍜宻etter鏂规硶锛屾瀯閫犲嚱鏁扮瓑鍙互鏍规嵁闇�姹傜敓鎴�
+
+}
+
+
diff --git a/src/main/java/com/zy/nc/vo/WhsTransBillHeaderVO.java b/src/main/java/com/zy/nc/vo/WhsTransBillHeaderVO.java
new file mode 100644
index 0000000..5bf6ec0
--- /dev/null
+++ b/src/main/java/com/zy/nc/vo/WhsTransBillHeaderVO.java
@@ -0,0 +1,207 @@
+package com.zy.nc.vo;
+
+import lombok.Data;
+
+/**
+ * 杞簱鍗曞疄浣撶被
+ */
+@Data
+public class WhsTransBillHeaderVO {
+
+
+    /**
+     * 瀹℃牳浜�
+     */
+    private String approver;
+
+    /**
+     * 鍒跺崟浜�
+     */
+    private String billmaker;
+
+    /**
+     * 寰呭鎵�
+     */
+    private String bwaitaudit;
+
+    /**
+     * 杞嚭浜�
+     */
+    private String cauditorid;
+
+    /**
+     * 鍑哄簱涓氬姟鍛�
+     */
+    private String cbizid;
+
+    /**
+     * 鍑哄簱閮ㄩ棬鏈�鏂扮増鏈�
+     */
+    private String cdptid;
+
+    /**
+     * 鍑哄簱閮ㄩ棬
+     */
+    private String cdptvid;
+
+    /**
+     * 鍏徃鏈�鏂扮増鏈�
+     */
+    private String corpoid;
+
+    /**
+     * 鍏徃
+     */
+    private String corpvid;
+
+    /**
+     * 鍏ュ簱涓氬姟鍛�
+     */
+    private String cotherbizid;
+
+    /**
+     * 鍏ュ簱閮ㄩ棬鏈�鏂扮増鏈�
+     */
+    private String cotherdptid;
+
+    /**
+     * 鍏ュ簱閮ㄩ棬
+     */
+    private String cotherdptvid;
+
+    /**
+     * 鍏ュ簱浠撳簱锛堝繀濉級
+     */
+    private String cotherwhid;
+
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    private String creationtime;
+
+    /**
+     * 鍒涘缓浜�
+     */
+    private String creator;
+
+    /**
+     * 杞簱鍗曚富閿�
+     */
+    private String csp茅cialhid;
+
+    /**
+     * 杞簱绫诲瀷锛堝繀濉級
+     */
+    private String ctrantypeid;
+
+    /**
+     * 鍑哄簱浠撳簱锛堝繀濉級
+     */
+    private String cwarehouseid;
+
+    /**
+     * 鍗曟嵁鏃ユ湡
+     */
+    private String dbilldate;
+
+    /**
+     * 鍒跺崟鏃ユ湡
+     */
+    private String dmakedate;
+
+    /**
+     * 搴斿埌璐ф棩鏈�
+     */
+    private String dshldarrivedate;
+
+    /**
+     * 搴斿彂璐ф棩鏈�
+     */
+    private String dshlddiliverdate;
+
+    /**
+     * 鍗曟嵁鐘舵��
+     */
+    private Integer fbillflag;
+
+    /**
+     * 鎵撳嵃娆℃暟
+     */
+    private Integer iprintcount;
+
+    /**
+     * 鏄惁閫�鏂�
+     */
+    private String isbackdeliver;
+
+    /**
+     * 鏈�鍚庝慨鏀规椂闂�
+     */
+    private String modifiedtime;
+
+    /**
+     * 鏈�鍚庝慨鏀逛汉
+     */
+    private String modifier;
+
+    /**
+     * 鎬绘暟閲�
+     */
+    private Double ntotalnum;
+
+    /**
+     * 闆嗗洟
+     */
+    private String pk_group;
+
+    /**
+     * 搴撳瓨缁勭粐鏈�鏂扮増鏈紙蹇呭～锛�
+     */
+    private String pk_org;
+
+    /**
+     * 搴撳瓨缁勭粐
+     */
+    private String pk_org_v;
+
+    /**
+     * 瀹℃牳鏃ユ湡
+     */
+    private String taudittime;
+
+    /**
+     * 杞叆浜�
+     */
+    private String vadjuster;
+
+    /**
+     * 鍗曟嵁鍙�
+     */
+    private String vbillcode;
+
+    /**
+     * 琛ㄥご鑷畾涔夐」1
+     */
+    private String vdef1;
+
+    /**
+     * 琛ㄥご鑷畾涔夐」2
+     */
+    private String vdef2;
+
+    // 姝ゅ鐪佺暐浜唙def3鑷硋def20鐨勫瓧娈碉紝鏍规嵁闇�瑕佹坊鍔�
+
+    /**
+     * 澶囨敞
+     */
+    private String vnote;
+
+    /**
+     * 杞簱绫诲瀷缂栫爜
+     */
+    private String vtrantypecode;
+
+    // 浠ヤ笅涓篻etter鍜宻etter鏂规硶锛屾瀯閫犲嚱鏁扮瓑鍙互鏍规嵁闇�姹傜敓鎴�
+
+
+}
diff --git a/src/main/java/com/zy/nc/vo/ic_generalout_b.java b/src/main/java/com/zy/nc/vo/ic_generalout_b.java
new file mode 100644
index 0000000..ee85861
--- /dev/null
+++ b/src/main/java/com/zy/nc/vo/ic_generalout_b.java
@@ -0,0 +1,4 @@
+package com.zy.nc.vo;
+
+public class ic_generalout_b {
+}
diff --git a/src/main/java/com/zy/nc/vo/ic_generalout_h.java b/src/main/java/com/zy/nc/vo/ic_generalout_h.java
new file mode 100644
index 0000000..a244083
--- /dev/null
+++ b/src/main/java/com/zy/nc/vo/ic_generalout_h.java
@@ -0,0 +1,859 @@
+package com.zy.nc.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鏅�氬嚭搴撳崟琛ㄤ綋瀹炰綋绫�
+ */
+@Data
+public class ic_generalout_h {
+
+
+    /**
+     * 搴撳瓨缁勭粐鏈�鏂扮増鏈紙蹇呭～锛�
+     */
+    private String pk_org;
+
+    /**
+     * 浠撳簱锛堝繀濉級
+     */
+    private String cwarehouseid;
+
+    /**
+     * 绛惧瓧浜�
+     */
+    private String approver;
+
+    /**
+     * 鍒跺崟浜�
+     */
+    private String billmaker;
+
+    /**
+     * 涓氬姟鍛�
+     */
+    private String cbizid;
+
+    /**
+     * 杩愯緭鏂瑰紡
+     */
+    private String cdilivertypeid;
+
+    /**
+     * 閮ㄩ棬鏈�鏂扮増鏈�
+     */
+    private String cdptid;
+
+    /**
+     * 閮ㄩ棬
+     */
+    private String cdptvid;
+
+    /**
+     * 鏅�氬嚭搴撳崟琛ㄤ綋涓婚敭
+     */
+    private String cgeneralbid;
+
+    /**
+     * 鏅�氬嚭搴撳崟琛ㄥご涓婚敭
+     */
+    private String cgeneralhid;
+
+    /**
+     * 鍏徃鏈�鏂扮増鏈�
+     */
+    private String corpoid;
+
+    /**
+     * 鍏徃
+     */
+    private String corpvid;
+
+    /**
+     * 鍏ュ簱搴撳瓨缁勭粐鏈�鏂扮増鏈�
+     */
+    private String cothercalbodyoid;
+
+    /**
+     * 鍏ュ簱搴撳瓨缁勭粐
+     */
+    private String cothercalbodyvid;
+
+    /**
+     * 鍏ュ簱浠撳簱
+     */
+    private String cotherwhid;
+
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    private Date creationtime;
+
+    /**
+     * 鍒涘缓浜�
+     */
+    private String creator;
+
+    /**
+     * 鍑哄叆搴撶被鍨�
+     */
+    private String ctrantypeid;
+
+    /**
+     * 搴撶鍛�
+     */
+    private String cwhsmanagerid;
+
+    /**
+     * 鍗曟嵁鏃ユ湡
+     */
+    private Date dbilldate;
+
+    /**
+     * 鍒跺崟鏃ユ湡
+     */
+    private Date dmakedate;
+
+    /**
+     * 鍗曟嵁鐘舵��
+     */
+    private Boolean fbillflag;
+
+    /**
+     * 鎵撳嵃娆℃暟
+     */
+    private Integer iprintcount;
+
+    /**
+     * 鏈�鍚庝慨鏀规椂闂�
+     */
+    private Date modifiedtime;
+
+    /**
+     * 鏈�鍚庝慨鏀逛汉
+     */
+    private String modifier;
+
+    /**
+     * 鎬绘暟閲�
+     */
+    private Double ntotalnum;
+
+    /**
+     * 鎬讳欢鏁�
+     */
+    private Double ntotalpiece;
+
+    /**
+     * 鎬讳綋绉�
+     */
+    private Double ntotalvolume;
+
+    /**
+     * 鎬婚噸閲�
+     */
+    private Double ntotalweight;
+
+    /**
+     * 闆嗗洟
+     */
+    private String pk_group;
+
+    /**
+     * 璁￠噺鍣ㄥ叿
+     */
+    private String pk_measware;
+
+    /**
+     * 搴撳瓨缁勭粐
+     */
+    private String pk_org_v;
+
+    /**
+     * 绛惧瓧鏃ユ湡
+     */
+    private Date taudittime;
+
+    /**
+     * 鐗╂祦缁勭粐鏈�鏂扮増鏈�
+     */
+    private String trafficorgoid;
+
+    /**
+     * 鐗╂祦缁勭粐
+     */
+    private String trafficorgvid;
+
+    /**
+     * 鍗曟嵁鍙�
+     */
+    private String vbillcode;
+
+    // 琛ㄥご鑷畾涔夐」锛坴def1 - vdef20锛�
+    private String vdef1;
+    private String vdef2;
+    private String vdef3;
+    private String vdef4;
+    private String vdef5;
+    private String vdef6;
+    private String vdef7;
+    private String vdef8;
+    private String vdef9;
+    private String vdef10;
+    private String vdef11;
+    private String vdef12;
+    private String vdef13;
+    private String vdef14;
+    private String vdef15;
+    private String vdef16;
+    private String vdef17;
+    private String vdef18;
+    private String vdef19;
+    private String vdef20;
+
+    /**
+     * 杩愯緭鍦板潃
+     */
+    private String vdiliveraddress;
+
+    /**
+     * 澶囨敞
+     */
+    private String vnote;
+
+    /**
+     * 鍑哄叆搴撶被鍨嬬紪鐮�
+     */
+    private String vtrantypecode;
+
+    /**
+     * 鐗╂枡缂栫爜锛堝繀濉級
+     */
+    private String cmaterialvid;
+
+    /**
+     * 璐т綅锛堝繀濉級
+     */
+    private String clocationid;
+
+    /**
+     * 搴斿彂鏁伴噺锛堝繀濉級
+     */
+    private Double nshouldassistnum;
+
+    /**
+     * 鍗曟嵁琛屾槸鍚︽潯鐮佸叧闂�
+     */
+    private Boolean bbarcodeclose;
+
+    /**
+     * 鏄惁鍦ㄩ��
+     */
+    private Boolean bonroadflag;
+
+    /**
+     * 瀹㈡埛
+     */
+    private String casscustid;
+
+    /**
+     * 鍗曚綅
+     */
+    private String castunitid;
+
+    /**
+     * 鍑哄叆搴撶被鍨�
+     */
+    private String cbodytranstypecode;
+
+    /**
+     * 搴撳瓨浠撳簱
+     */
+    private String cbodywarehouseid;
+
+    /**
+     * 瀵瑰簲鍏ュ簱鍗曡〃浣撲富閿�
+     */
+    private String ccorrespondbid;
+
+    /**
+     * 瀵瑰簲鍏ュ簱鍗曞彿
+     */
+    private String ccorrespondcode;
+
+    /**
+     * 瀵瑰簲鍏ュ簱鍗曡〃澶翠富閿�
+     */
+    private String ccorrespondhid;
+
+    /**
+     * 瀵瑰簲鍏ュ簱鍗曡鍙�
+     */
+    private String ccorrespondrowno;
+
+    /**
+     * 瀵瑰簲鍏ュ簱鍗曚氦鏄撶被鍨�
+     */
+    private String ccorrespondtranstype;
+
+    /**
+     * 瀵瑰簲鍏ュ簱鍗曠被鍨�
+     */
+    private String ccorrespondtype;
+
+    /**
+     * 鎴愭湰瀵硅薄
+     */
+    private String ccostobject;
+
+    /**
+     * 鐗瑰緛鐮�
+     */
+    private String cffileid;
+
+    /**
+     * 婧愬ご鍗曟嵁琛ㄤ綋涓婚敭
+     */
+    private String cfirstbillbid;
+
+    /**
+     * 婧愬ご鍗曟嵁琛ㄥご涓婚敭
+     */
+    private String cfirstbillhid;
+
+    /**
+     * 婧愬ご鍗曟嵁浜ゆ槗绫诲瀷
+     */
+    private String cfirsttranstype;
+
+    /**
+     * 婧愬ご鍗曟嵁绫诲瀷
+     */
+    private String cfirsttype;
+
+    /**
+     * 鏅�氬嚭搴撳崟璐т綅鍗曞搧琛ㄤ富閿�
+     */
+    private String cgenerallid;
+
+    /**
+     * 鍑哄簱鍒╂鼎涓績
+     */
+    private String cliabilityoid;
+
+    /**
+     * 鍑哄簱鍒╂鼎涓績
+     */
+    private String cliabilityvid;
+
+    /**
+     * 鐗╂枡
+     */
+    private String cmaterialoid;
+
+    /**
+     * 鎴愭湰瑕佺礌
+     */
+    private String costclsidreason;
+
+    /**
+     * 鐢熶骇鍘傚晢
+     */
+    private String cproductorid;
+
+    /**
+     * 椤圭洰
+     */
+    private String cprojectid;
+
+    /**
+     * 椤圭洰浠诲姟
+     */
+    private String cprojecttaskid;
+
+    /**
+     * 璐ㄩ噺绛夌骇
+     */
+    private String cqualitylevelid;
+
+    /**
+     * 鏀惰揣瀹㈡埛
+     */
+    private String creceieveid;
+
+    /**
+     * 鏀惰揣鍦板尯
+     */
+    private String creceiveareaid;
+
+    /**
+     * 鏀惰揣鍦扮偣
+     */
+    private String creceivepointid;
+
+    /**
+     * 琛屽彿
+     */
+    private String crowno;
+
+    /**
+     * 閫夋嫨鎷嗚В鍗曚綅
+     */
+    private String cselastunitid;
+
+    /**
+     * 搴忓垪鍙疯川閲忕瓑绾�
+     */
+    private String csnqualitylevelid;
+
+    /**
+     * 搴忓垪鍙峰崟浣�
+     */
+    private String csnunitid;
+
+    /**
+     * 鏉ユ簮鍗曟嵁琛ㄤ綋涓婚敭
+     */
+    private String csourcebillbid;
+
+    /**
+     * 鏉ユ簮鍗曟嵁琛ㄥご涓婚敭
+     */
+    private String csourcebillhid;
+
+    /**
+     * 鏉ユ簮鍗曟嵁浜ゆ槗绫诲瀷
+     */
+    private String csourcetranstype;
+
+    /**
+     * 鏉ユ簮鍗曟嵁绫诲瀷
+     */
+    private String csourcetype;
+
+    /**
+     * 鍏朵粬鏉ユ簮鍗曡涓婚敭
+     */
+    private String csrc2billbid;
+
+    /**
+     * 鍏朵粬鏉ユ簮鍗曚富閿�
+     */
+    private String csrc2billhid;
+
+    /**
+     * 鍏朵粬鏉ユ簮鍗曟嵁绫诲瀷缂栫爜
+     */
+    private String csrc2billtype;
+
+    /**
+     * 鍏朵粬鏉ユ簮浜ゆ槗绫诲瀷缂栫爜
+     */
+    private String csrc2transtype;
+
+    /**
+     * 搴撳瓨鐘舵��
+     */
+    private String cstateid;
+
+    /**
+     * VMI姹囨��
+     */
+    private String csumid;
+
+    /**
+     * 璐т富瀹㈡埛
+     */
+    private String ctplcustomerid;
+
+    /**
+     * 涓诲崟浣�
+     */
+    private String cunitid;
+
+    /**
+     * 渚涘簲鍟�
+     */
+    private String cvendorid;
+
+    /**
+     * 瀵勫瓨渚涘簲鍟�
+     */
+    private String cvmivenderid;
+
+    /**
+     * 鍑哄簱鏃ユ湡
+     */
+    private Date dbizdate;
+
+    /**
+     * 棣栨鍏ュ簱鏃ユ湡
+     */
+    private Date dinbounddate;
+
+    /**
+     * 鐢熶骇鏃ユ湡
+     */
+    private Date dproducedate;
+
+    /**
+     * 澶辨晥鏃ユ湡
+     */
+    private Date dvalidate;
+
+    /**
+     * 鎵规鐗堟湰鍙�
+     */
+    private Integer ibcversion;
+
+    /**
+     * 鎷嗚В绫诲瀷
+     */
+    private Integer idesatype;
+
+    /**
+     * 绱姹囨�诲尮閰嶄富鏁伴噺
+     */
+    private Double naccumvminum;
+
+    /**
+     * 瀹炲彂鏁伴噺
+     */
+    private Double nassistnum;
+
+    /**
+     * 鏉＄爜鏁伴噺
+     */
+    private Double nbarcodenum;
+
+    /**
+     * 绱鍑哄簱鏁伴噺
+     */
+    private Double ncorrespondastnum;
+
+    /**
+     * 绱鍑哄簱姣涢噸涓绘暟閲�
+     */
+    private Double ncorrespondgrsnum;
+
+    /**
+     * 绱鍑哄簱涓绘暟閲�
+     */
+    private Double ncorrespondnum;
+
+    /**
+     * 閲戦
+     */
+    private Double ncostmny;
+
+    /**
+     * 鍗曚环
+     */
+    private Double ncostprice;
+
+    /**
+     * 绠辨暟
+     */
+    private Double ncountnum;
+
+    /**
+     * 姣涢噸涓绘暟閲�
+     */
+    private Double ngrossnum;
+
+    /**
+     * 瀹炲彂涓绘暟閲�
+     */
+    private Double nnum;
+
+    /**
+     * 浠舵暟
+     */
+    private Double npiece;
+
+    /**
+     * 璁″垝閲戦
+     */
+    private Double nplannedmny;
+
+    /**
+     * 璁″垝鍗曚环
+     */
+    private Double nplannedprice;
+
+    /**
+     * 搴斿彂涓绘暟閲�
+     */
+    private Double nshouldnum;
+
+    /**
+     * 鐨噸涓绘暟閲�
+     */
+    private Double ntarenum;
+
+    /**
+     * 绱杩愯緭涓绘暟閲�
+     */
+    private Double ntotaltrannum;
+
+    /**
+     * 浣撶Н
+     */
+    private Double nvolume;
+
+    /**
+     * 閲嶉噺
+     */
+    private Double nweight;
+
+    /**
+     * 鎵规涓婚敭
+     */
+    private String pk_batchcode;
+
+    /**
+     * 鍖呰绫诲瀷
+     */
+    private String pk_packsort;
+
+    /**
+     * 搴忓垪鍙蜂富閿�
+     */
+    private String pk_serialcode;
+
+    /**
+     * 妫�楠屾椂闂�
+     */
+    private Date tchecktime;
+
+    /**
+     * 鏉ユ簮琛ㄤ綋鏃堕棿鎴�
+     */
+    private Date tsourcebodyts;
+
+    /**
+     * 鏉ユ簮琛ㄥご鏃堕棿鎴�
+     */
+    private Date tsourceheadts;
+
+    /**
+     * 鎵规鍙�
+     */
+    private String vbatchcode;
+
+    /**
+     * 鎵规澶囨敞
+     */
+    private String vbatchcodenote;
+
+    // 鎵规鑷畾涔夐」锛坴bcdef1 - vbcdef20锛�
+    private String vbcdef1;
+    private String vbcdef2;
+    private String vbcdef3;
+    private String vbcdef4;
+    private String vbcdef5;
+    private String vbcdef6;
+    private String vbcdef7;
+    private String vbcdef8;
+    private String vbcdef9;
+    private String vbcdef10;
+    private String vbcdef11;
+    private String vbcdef12;
+    private String vbcdef13;
+    private String vbcdef14;
+    private String vbcdef15;
+    private String vbcdef16;
+    private String vbcdef17;
+    private String vbcdef18;
+    private String vbcdef19;
+    private String vbcdef20;
+
+    // 琛ㄤ綋鑷畾涔夐」锛坴bdef1 - vbdef20锛�
+    private String vbdef1;
+    private String vbdef2;
+    private String vbdef3;
+    private String vbdef4;
+    private String vbdef5;
+    private String vbdef6;
+    private String vbdef7;
+    private String vbdef8;
+    private String vbdef9;
+    private String vbdef10;
+    private String vbdef11;
+    private String vbdef12;
+    private String vbdef13;
+    private String vbdef14;
+    private String vbdef15;
+    private String vbdef16;
+    private String vbdef17;
+    private String vbdef18;
+    private String vbdef19;
+    private String vbdef20;
+
+    /**
+     * 鍗曟嵁鏉＄爜
+     */
+    private String vbillbarcode;
+
+    /**
+     * 鏉ヨ嚜浜庨浂鍞箣鍗曟嵁绫诲瀷
+     */
+    private String vbilltypeu8rm;
+
+    /**
+     * 鎹㈢畻鐜�
+     */
+    private String vchangerate;
+
+    /**
+     * 绱ф�ユ斁琛岀敵璇峰崟琛屼富閿�
+     */
+    private String vexigencybid;
+
+    /**
+     * 绱ф�ユ斁琛岀敵璇峰崟鍙�
+     */
+    private String vexigencycode;
+
+    /**
+     * 绱ф�ユ斁琛岀敵璇峰崟涓婚敭
+     */
+    private String vexigencyhid;
+
+    /**
+     * 绱ф�ユ斁琛岀敵璇峰崟琛屽彿
+     */
+    private String vexigencyrowno;
+
+    /**
+     * 绱ф�ユ斁琛屽崟鎹被鍨�
+     */
+    private String vexigencytype;
+
+    /**
+     * 婧愬ご鍗曟嵁鍙�
+     */
+    private String vfirstbillcode;
+
+    /**
+     * 婧愬ご鍗曟嵁琛屽彿
+     */
+    private String vfirstrowno;
+
+    // 鑷敱杈呭姪灞炴�э紙vfree1 - vfree10锛�
+    private String vfree1;
+    private String vfree2;
+    private String vfree3;
+    private String vfree4;
+    private String vfree5;
+    private String vfree6;
+    private String vfree7;
+    private String vfree8;
+    private String vfree9;
+    private String vfree10;
+
+    /**
+     * 琛屽娉�
+     */
+    private String vnotebody;
+
+    /**
+     * 鐢熶骇璁㈠崟鍙�
+     */
+    private String vproductbatch;
+
+    /**
+     * 鏀惰揣鍦板潃
+     */
+    private String vreceiveaddress;
+
+    /**
+     * 搴忓垪鍙�
+     */
+    private String vserialcode;
+
+    // 搴忓垪鍙疯嚜瀹氫箟椤癸紙vsndef1 - vsndef40锛�
+    private String vsndef1;
+    private String vsndef2;
+    private String vsndef3;
+    private String vsndef4;
+    private String vsndef5;
+    private String vsndef6;
+    private String vsndef7;
+    private String vsndef8;
+    private String vsndef9;
+    private String vsndef10;
+    private String vsndef11;
+    private String vsndef12;
+    private String vsndef13;
+    private String vsndef14;
+    private String vsndef15;
+    private String vsndef16;
+    private String vsndef17;
+    private String vsndef18;
+    private String vsndef19;
+    private String vsndef20;
+    private String vsndef21;
+    private String vsndef22;
+    private String vsndef23;
+    private String vsndef24;
+    private String vsndef25;
+    private String vsndef26;
+    private String vsndef27;
+    private String vsndef28;
+    private String vsndef29;
+    private String vsndef30;
+    private String vsndef31;
+    private String vsndef32;
+    private String vsndef33;
+    private String vsndef34;
+    private String vsndef35;
+    private String vsndef36;
+    private String vsndef37;
+    private String vsndef38;
+    private String vsndef39;
+    private String vsndef40;
+
+    /**
+     * 鏉ユ簮鍗曟嵁鍙�
+     */
+    private String vsourcebillcode;
+
+    /**
+     * 鏉ユ簮鍗曟嵁琛屽彿
+     */
+    private String vsourcerowno;
+
+    /**
+     * 鍏朵粬鏉ユ簮鍗曟嵁鍙�
+     */
+    private String vsrc2billcode;
+
+    /**
+     * 鍏朵粬鏉ユ簮鍗曡鍙�
+     */
+    private String vsrc2billrowno;
+
+    /**
+     * 鏀惰揣杞﹀彿
+     */
+    private String vtransfercode;
+
+    /**
+     * 鏉ヨ嚜浜庨浂鍞箣浜ゆ槗绫诲瀷
+     */
+    private String vtranstypeu8rm;
+
+    /**
+     * 杩愯緭宸ュ叿鍙�
+     */
+    private String vvehiclecode;
+
+    /**
+     * 渚涘簲鍟嗘壒娆″彿
+     */
+    private String vvendbatchcode;
+}
+
diff --git a/src/main/java/com/zy/nc/vo/ic_purchasein_b.java b/src/main/java/com/zy/nc/vo/ic_purchasein_b.java
new file mode 100644
index 0000000..7eb9cf5
--- /dev/null
+++ b/src/main/java/com/zy/nc/vo/ic_purchasein_b.java
@@ -0,0 +1,297 @@
+package com.zy.nc.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鍏ュ簱鍗曡〃浣撳疄浣撶被
+ */
+@Data
+public class ic_purchasein_b {
+
+
+    /**
+     * 搴撳瓨缁勭粐鏈�鏂扮増鏈紙蹇呭～锛�
+     */
+    private String pk_org;
+
+    /**
+     * 浠撳簱锛堝繀濉級
+     */
+    private String cwarehouseid;
+
+    /**
+     * 绛惧瓧浜�
+     */
+    private String approver;
+
+    /**
+     * 鍒跺崟浜�
+     */
+    private String billmaker;
+
+    /**
+     * 杩涘彛鍏ュ簱鍗�
+     */
+    private String bitinbill;
+
+    /**
+     * 涓夎璐告槗
+     */
+    private String btriatradeflag;
+
+    /**
+     * 閲囪喘鍛�
+     */
+    private String cbizid;
+
+    /**
+     * 涓氬姟娴佺▼
+     */
+    private String cbiztype;
+
+    /**
+     * 缁撶畻鎴愭湰鍩�
+     */
+    private String ccostdomainid;
+
+    /**
+     * 鏀惰揣瀹㈡埛
+     */
+    private String ccustomerid;
+
+    /**
+     * 閲囪喘閮ㄩ棬鏈�鏂扮増鏈�
+     */
+    private String cdptid;
+
+    /**
+     * 閲囪喘閮ㄩ棬
+     */
+    private String cdptvid;
+
+    /**
+     * 缁撶畻璐㈠姟缁勭粐鏈�鏂扮増鏈�
+     */
+    private String cfanaceorgoid;
+
+    /**
+     * 缁撶畻璐㈠姟缁勭粐
+     */
+    private String cfanaceorgvid;
+
+    /**
+     * 鍏ュ簱鍗曡〃浣撲富閿�
+     */
+    private String cgeneralbid;
+
+    /**
+     * 鍏ュ簱鍗曡〃澶翠富閿�
+     */
+    private String cgeneralhid;
+
+    /**
+     * 鍏徃鏈�鏂扮増鏈�
+     */
+    private String corpoid;
+
+    /**
+     * 鍏徃
+     */
+    private String corpvid;
+
+    /**
+     * 搴斾粯璐㈠姟缁勭粐鏈�鏂扮増鏈�
+     */
+    private String cpayfinorgoid;
+
+    /**
+     * 搴斾粯璐㈠姟缁勭粐
+     */
+    private String cpayfinorgvid;
+
+    /**
+     * 閲囪喘缁勭粐
+     */
+    private String cpurorgoid;
+
+    /**
+     * 閲囪喘缁勭粐鏈�鏂扮増鏈�
+     */
+    private String cpurorgvid;
+
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    private Date creationtime;
+
+    /**
+     * 鍒涘缓浜�
+     */
+    private String creator;
+
+    /**
+     * 鏀惰揣鍥�
+     */
+    private String crececountryid;
+
+    /**
+     * 鍙戣揣鍥�
+     */
+    private String csendcountryid;
+
+    /**
+     * 杩愯緭鏂瑰紡
+     */
+    private String csendtypeid;
+
+    /**
+     * 鎶ョ◣鍥�
+     */
+    private String ctaxcountryid;
+
+    /**
+     * 璐告槗鏈
+     */
+    private String ctradewordid;
+
+    /**
+     * 鍑哄叆搴撶被鍨�
+     */
+    private String ctrantypeid;
+
+    /**
+     * 渚涘簲鍟�
+     */
+    private String cvendorid;
+
+    /**
+     * 搴撶鍛�
+     */
+    private String cwhsmanagerid;
+
+    /**
+     * 鍗曟嵁鏃ユ湡
+     */
+    private Date dbilldate;
+
+    /**
+     * 鍒跺崟鏃ユ湡
+     */
+    private Date dmakedate;
+
+    /**
+     * 鍗曟嵁鐘舵��
+     */
+    private Boolean fbillflag;
+
+    /**
+     * 璐攢绫诲瀷
+     */
+    private Boolean fbuysellflag;
+
+    /**
+     * 閲囪喘閫�搴�
+     */
+    private Boolean freplenishflag;
+
+    /**
+     * 鎵撳嵃娆℃暟
+     */
+    private Integer iprintcount;
+
+    /**
+     * 鏈�鍚庝慨鏀规椂闂�
+     */
+    private Date modifiedtime;
+
+    /**
+     * 鏈�鍚庝慨鏀逛汉
+     */
+    private String modifier;
+
+    /**
+     * 鎬绘暟閲�
+     */
+    private Double ntotalnum;
+
+    /**
+     * 鎬讳欢鏁�
+     */
+    private Double ntotalpiece;
+
+    /**
+     * 鎬讳綋绉�
+     */
+    private Double ntotalvolume;
+
+    /**
+     * 鎬婚噸閲�
+     */
+    private Double ntotalweight;
+
+    /**
+     * 闆嗗洟
+     */
+    private String pk_group;
+
+    /**
+     * 璁￠噺鍣ㄥ叿
+     */
+    private String pk_measware;
+
+    /**
+     * 搴撳瓨缁勭粐
+     */
+    private String pk_org_v;
+
+    /**
+     * 绛惧瓧鏃ユ湡
+     */
+    private Date taudittime;
+
+    /**
+     * 鍗曟嵁鍙�
+     */
+    private String vbillcode;
+
+    // 琛ㄥご鑷畾涔夐」锛坴def1 - vdef20锛�
+    private String vdef1;
+    private String vdef2;
+    private String vdef3;
+    private String vdef4;
+    private String vdef5;
+    private String vdef6;
+    private String vdef7;
+    private String vdef8;
+    private String vdef9;
+    private String vdef10;
+    private String vdef11;
+    private String vdef12;
+    private String vdef13;
+    private String vdef14;
+    private String vdef15;
+    private String vdef16;
+    private String vdef17;
+    private String vdef18;
+    private String vdef19;
+    private String vdef20;
+
+    /**
+     * 澶囨敞
+     */
+    private String vnote;
+
+    /**
+     * 閫�搴撶悊鐢�
+     */
+    private String vreturnreason;
+
+    /**
+     * 鍑哄叆搴撶被鍨嬬紪鐮�
+     */
+    private String vtrantypecode;
+
+
+}
diff --git a/src/main/java/com/zy/nc/vo/ic_purchasein_h.java b/src/main/java/com/zy/nc/vo/ic_purchasein_h.java
new file mode 100644
index 0000000..abf393e
--- /dev/null
+++ b/src/main/java/com/zy/nc/vo/ic_purchasein_h.java
@@ -0,0 +1,300 @@
+package com.zy.nc.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鍏ュ簱鍗曞疄浣撶被
+ */
+@Data
+public class ic_purchasein_h {
+
+
+    /**
+     * 搴撳瓨缁勭粐鏈�鏂扮増鏈紙蹇呭～锛�
+     */
+    private String pk_org;
+
+    /**
+     * 浠撳簱锛堝繀濉級
+     */
+    private String cwarehouseid;
+
+    /**
+     * 绛惧瓧浜�
+     */
+    private String approver;
+
+    /**
+     * 鍒跺崟浜�
+     */
+    private String billmaker;
+
+    /**
+     * 杩涘彛鍏ュ簱鍗�
+     */
+    private String bitinbill;
+
+    /**
+     * 涓夎璐告槗
+     */
+    private String btriatradeflag;
+
+    /**
+     * 閲囪喘鍛�
+     */
+    private String cbizid;
+
+    /**
+     * 涓氬姟娴佺▼
+     */
+    private String cbiztype;
+
+    /**
+     * 缁撶畻鎴愭湰鍩�
+     */
+    private String ccostdomainid;
+
+    /**
+     * 鏀惰揣瀹㈡埛
+     */
+    private String ccustomerid;
+
+    /**
+     * 閲囪喘閮ㄩ棬鏈�鏂扮増鏈�
+     */
+    private String cdptid;
+
+    /**
+     * 閲囪喘閮ㄩ棬
+     */
+    private String cdptvid;
+
+    /**
+     * 缁撶畻璐㈠姟缁勭粐鏈�鏂扮増鏈�
+     */
+    private String cfanaceorgoid;
+
+    /**
+     * 缁撶畻璐㈠姟缁勭粐
+     */
+    private String cfanaceorgvid;
+
+    /**
+     * 鍏ュ簱鍗曡〃浣撲富閿�
+     */
+    private String cgeneralbid;
+
+    /**
+     * 鍏ュ簱鍗曡〃澶翠富閿�
+     */
+    private String cgeneralhid;
+
+    /**
+     * 鍏徃鏈�鏂扮増鏈�
+     */
+    private String corpoid;
+
+    /**
+     * 鍏徃
+     */
+    private String corpvid;
+
+    /**
+     * 搴斾粯璐㈠姟缁勭粐鏈�鏂扮増鏈�
+     */
+    private String cpayfinorgoid;
+
+    /**
+     * 搴斾粯璐㈠姟缁勭粐
+     */
+    private String cpayfinorgvid;
+
+    /**
+     * 閲囪喘缁勭粐
+     */
+    private String cpurorgoid;
+
+    /**
+     * 閲囪喘缁勭粐鏈�鏂扮増鏈�
+     */
+    private String cpurorgvid;
+
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    private Date creationtime;
+
+    /**
+     * 鍒涘缓浜�
+     */
+    private String creator;
+
+    /**
+     * 鏀惰揣鍥�
+     */
+    private String crececountryid;
+
+    /**
+     * 鍙戣揣鍥�
+     */
+    private String csendcountryid;
+
+    /**
+     * 杩愯緭鏂瑰紡
+     */
+    private String csendtypeid;
+
+    /**
+     * 鎶ョ◣鍥�
+     */
+    private String ctaxcountryid;
+
+    /**
+     * 璐告槗鏈
+     */
+    private String ctradewordid;
+
+    /**
+     * 鍑哄叆搴撶被鍨�
+     */
+    private String ctrantypeid;
+
+    /**
+     * 渚涘簲鍟�
+     */
+    private String cvendorid;
+
+    /**
+     * 搴撶鍛�
+     */
+    private String cwhsmanagerid;
+
+    /**
+     * 鍗曟嵁鏃ユ湡
+     */
+    private Date dbilldate;
+
+    /**
+     * 鍒跺崟鏃ユ湡
+     */
+    private Date dmakedate;
+
+    /**
+     * 鍗曟嵁鐘舵��
+     */
+    private String fbillflag;
+
+    /**
+     * 璐攢绫诲瀷
+     */
+    private String fbuysellflag;
+
+    /**
+     * 閲囪喘閫�搴�
+     */
+    private String freplenishflag;
+
+    /**
+     * 鎵撳嵃娆℃暟
+     */
+    private Integer iprintcount;
+
+    /**
+     * 鏈�鍚庝慨鏀规椂闂�
+     */
+    private Date modifiedtime;
+
+    /**
+     * 鏈�鍚庝慨鏀逛汉
+     */
+    private String modifier;
+
+    /**
+     * 鎬绘暟閲�
+     */
+    private Double ntotalnum;
+
+    /**
+     * 鎬讳欢鏁�
+     */
+    private Double ntotalpiece;
+
+    /**
+     * 鎬讳綋绉�
+     */
+    private Double ntotalvolume;
+
+    /**
+     * 鎬婚噸閲�
+     */
+    private Double ntotalweight;
+
+    /**
+     * 闆嗗洟
+     */
+    private String pk_group;
+
+    /**
+     * 璁￠噺鍣ㄥ叿
+     */
+    private String pk_measware;
+
+    /**
+     * 搴撳瓨缁勭粐
+     */
+    private String pk_org_v;
+
+    /**
+     * 绛惧瓧鏃ユ湡
+     */
+    private Date taudittime;
+
+    /**
+     * 鍗曟嵁鍙�
+     */
+    private String vbillcode;
+
+    // 琛ㄥご鑷畾涔夐」锛坴def1 - vdef20锛�
+    private String vdef1;
+    private String vdef2;
+    private String vdef3;
+    private String vdef4;
+    private String vdef5;
+    private String vdef6;
+    private String vdef7;
+    private String vdef8;
+    private String vdef9;
+    private String vdef10;
+    private String vdef11;
+    private String vdef12;
+    private String vdef13;
+    private String vdef14;
+    private String vdef15;
+    private String vdef16;
+    private String vdef17;
+    private String vdef18;
+    private String vdef19;
+    private String vdef20;
+
+    /**
+     * 澶囨敞
+     */
+    private String vnote;
+
+    /**
+     * 閫�搴撶悊鐢�
+     */
+    private String vreturnreason;
+
+    /**
+     * 鍑哄叆搴撶被鍨嬬紪鐮�
+     */
+    private String vtrantypecode;
+
+    // 浠ヤ笅涓篻etter鍜宻etter鏂规硶锛屾瀯閫犲嚱鏁扮瓑鍙互鏍规嵁闇�姹傜敓鎴�
+
+}
+
+
diff --git a/src/main/resources/mapper/asrs/OrderMapper.xml b/src/main/resources/mapper/asrs/OrderMapper.xml
index f8c5070..b797d4e 100644
--- a/src/main/resources/mapper/asrs/OrderMapper.xml
+++ b/src/main/resources/mapper/asrs/OrderMapper.xml
@@ -55,6 +55,18 @@
         and id = #{orderId}
     </update>
 
+    <update id="updateSettleStep">
+        update man_order
+        set settle = #{settle}
+        ,update_time = getdate()
+        ,step = #{step}
+        <if test="userId != null">
+            ,update_by = #{userId}
+        </if>
+        where 1=1
+        and id = #{orderId}
+    </update>
+
     <select id="selectComplete" resultMap="BaseResultMap">
         select top 5 *
         from man_order

--
Gitblit v1.9.1