From ee2e593c5736c27dad7d93f9fca98290f578b5da Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 21 五月 2025 21:36:25 +0800
Subject: [PATCH] 接口编写
---
src/main/java/com/zy/nc/entity/NccSaleDbddWms.java | 359 ++++++++
src/main/java/com/zy/nc/service/NccSaleDbddWmsService.java | 16
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 62 +
src/main/java/com/zy/nc/mapper/NccSaleDbddWmsMapper.java | 21
src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java | 81 +
src/main/java/com/zy/nc/service/impl/NccSaleDbddWmsServiceImpl.java | 29
src/main/resources/com/zy/nc/mapper/NccSaleDbddWmsMapper.xml | 59 +
src/main/resources/mapper/nc/NccScZkmxbWmsMapper.xml | 4
src/main/java/com/zy/nc/vo/ic_purchasein_b.java | 1584 ++++++++++++++++++++++++++++++++++++--
src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java | 24
src/main/java/com/zy/nc/task/PlanOrderTask.java | 38
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 2
src/main/resources/mapper/nc/NccSaleDbddWmsMapper.xml | 65 +
13 files changed, 2,167 insertions(+), 177 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index aab9699..c02a411 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -105,6 +105,7 @@
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getBrand(), detail.getStandby1(), detail.getStandby2(), detail.getStandby3(), detail.getLineNumber(), detail.getBoxType1(), detail.getBoxType2(), detail.getBoxType3(), detail.getAnfme());
+ dto.setRemark(detail.getRemark());
if (DetlDto.hasLineNumber(list, dto)) {
DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getLineNumber(), dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
assert detlDto != null;
@@ -136,6 +137,7 @@
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
orderDetl.setPakinPakoutStatus(1);
+ orderDetl.setRemark(detlDto.getRemark());
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
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 f46ee1b..b82f56d 100644
--- a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
@@ -11,6 +11,7 @@
import com.zy.asrs.service.OrderService;
import com.zy.asrs.service.ReportToThirdService;
import com.zy.nc.SendUtil;
+import com.zy.nc.entity.NccCgCgdhdWms;
import com.zy.nc.entity.NccSaleXsfhmxWms;
import com.zy.nc.util.NcResultMessage;
import com.zy.nc.vo.*;
@@ -259,14 +260,13 @@
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());
+ NccCgCgdhdWms nccCgCgdhdWms = JSONObject.parseObject(remark, NccCgCgdhdWms.class);
+ ic_purchasein_b.setCsourcebillbid(nccCgCgdhdWms.getPkArriveorderB());
+ ic_purchasein_b.setCsourcebillhid(nccCgCgdhdWms.getPkArriveorder());
+ ic_purchasein_b.setCmaterialvid(orderDetl.getMaktx());
+ ic_purchasein_b.setNnum(orderDetl.getQty());
+ ic_purchasein_b.setNshouldassistnum(orderDetl.getQty());
+ //ic_purchasein_b.setNorigprice(nccSaleXsfhmxWms.getNorigprice().doubleValue());
}
ic_purchasein_bs.add(ic_purchasein_b);
}
@@ -292,13 +292,7 @@
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);
}
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 36e06ac..fee5c4c 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,8 +1,12 @@
package com.zy.asrs.task;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.zy.asrs.entity.InventoryCheckOrder;
import com.zy.asrs.entity.Order;
import com.zy.asrs.service.ApiLogService;
+import com.zy.asrs.service.InventoryCheckOrderDetlService;
+import com.zy.asrs.service.InventoryCheckOrderService;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OrderSyncHandler;
@@ -31,6 +35,13 @@
@Autowired
private ApiLogService apiLogService;
+
+ @Autowired
+ private InventoryCheckOrderDetlService inventoryCheckOrderDetlService;
+
+ @Autowired
+ private InventoryCheckOrderService inventoryCheckOrderService;
+
@Value("${erp.switch.ErpReportOld}")
private boolean ErpReportOld;
@@ -51,9 +62,9 @@
try {
ReturnT<String> result = orderSyncHandler.startOrderIssuedOnceMore(order);
if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]鍐嶆杞墽琛岃〃澶辫触:{}", order.getOrderNo(),result.getMsg());
+ log.error("鍗曟嵁[orderNo={}]鍐嶆杞墽琛岃〃澶辫触:{}", order.getOrderNo(), result.getMsg());
}
- } catch (Exception e){
+ } catch (Exception e) {
log.error(e.getMessage());
log.error("鍗曟嵁[orderNo={}]鍐嶆杞墽琛岃〃澶辫触", order.getOrderNo());
}
@@ -65,19 +76,19 @@
public void completeAndReportOrderIssued() {
// String erpReport = Parameter.get().getErpReport();
// if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
- List<Order> orderList = orderService.selectComplete1();
+ List<Order> orderList = orderService.selectComplete1();
// List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("settle", 1L).eq("status", 1).orderBy("create_time", true));
- for (Order order : orderList) {
- try {
- ReturnT<String> result = orderSyncHandler.startOrderIssued(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]杞墽琛岃〃澶辫触", order.getOrderNo());
- }
- } catch (Exception e){
- log.error(e.getMessage());
+ for (Order order : orderList) {
+ try {
+ ReturnT<String> result = orderSyncHandler.startOrderIssued(order);
+ if (!result.isSuccess()) {
log.error("鍗曟嵁[orderNo={}]杞墽琛岃〃澶辫触", order.getOrderNo());
}
+ } catch (Exception e) {
+ log.error(e.getMessage());
+ log.error("鍗曟嵁[orderNo={}]杞墽琛岃〃澶辫触", order.getOrderNo());
}
+ }
// }
}
@@ -86,18 +97,18 @@
public void completeAndReportOrderInAndOutUtil() {
// String erpReport = Parameter.get().getErpReport();
// if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
- List<Order> orders = OrderInAndOutUtil.selectComplete(null);
- for (Order order : orders) {
- try {
- ReturnT<String> result = orderSyncHandler.startOrderInAndOutUtil(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo());
- }
- } catch (Exception e){
- log.error(e.getMessage());
+ List<Order> orders = OrderInAndOutUtil.selectComplete(null);
+ for (Order order : orders) {
+ try {
+ ReturnT<String> result = orderSyncHandler.startOrderInAndOutUtil(order);
+ if (!result.isSuccess()) {
log.error("鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo());
}
+ } catch (Exception e) {
+ log.error(e.getMessage());
+ log.error("鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo());
}
+ }
// }
}
@@ -123,4 +134,15 @@
}
}
}
+
+ @Scheduled(cron = "0/30 * * * * ? ")
+ public void completeCheck() {
+ String erpReport = Parameter.get().getErpReport();
+ if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+ List<InventoryCheckOrder> inventoryCheckOrders = inventoryCheckOrderService.selectList(new EntityWrapper<InventoryCheckOrder>().eq("status", 2));
+ for (InventoryCheckOrder inventoryCheckOrder : inventoryCheckOrders) {
+
+ }
+ }
+ }
}
diff --git a/src/main/java/com/zy/nc/entity/NccSaleDbddWms.java b/src/main/java/com/zy/nc/entity/NccSaleDbddWms.java
new file mode 100644
index 0000000..e721c5f
--- /dev/null
+++ b/src/main/java/com/zy/nc/entity/NccSaleDbddWms.java
@@ -0,0 +1,359 @@
+package com.zy.nc.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.math.BigDecimal;
+import lombok.Data;
+
+/**
+ *
+ * @TableName ncc_sale_dbdd_wms
+ */
+@TableName(value ="ncc_sale_dbdd_wms")
+@Data
+public class NccSaleDbddWms {
+ /**
+ *
+ */
+ @TableId
+ private String cbillid;
+
+ /**
+ *
+ */
+ private String vbillcode;
+
+ /**
+ *
+ */
+ private String dbilldate;
+
+ /**
+ *
+ */
+ private String taudittime;
+
+ /**
+ *
+ */
+ private String drkczzbm;
+
+ /**
+ *
+ */
+ private String drkczzmc;
+
+ /**
+ *
+ */
+ private String dckczzbm;
+
+ /**
+ *
+ */
+ private String dckczzmc;
+
+ /**
+ *
+ */
+ private String dcbmbm;
+
+ /**
+ *
+ */
+ private String dcbmmc;
+
+ /**
+ *
+ */
+ private String drbmbm;
+
+ /**
+ *
+ */
+ private String drbmmc;
+
+ /**
+ *
+ */
+ private String drckbm;
+
+ /**
+ *
+ */
+ private String drckmc;
+
+ /**
+ *
+ */
+ private String dcckbm;
+
+ /**
+ *
+ */
+ private String dcckmc;
+
+ /**
+ *
+ */
+ private String zdw;
+
+ /**
+ *
+ */
+ private BigDecimal zsl;
+
+ /**
+ *
+ */
+ private String fdw;
+
+ /**
+ *
+ */
+ private BigDecimal fsl;
+
+ /**
+ *
+ */
+ private BigDecimal yfwfzsl;
+
+ /**
+ *
+ */
+ private Long fstatusflag;
+
+ /**
+ *
+ */
+ private Long frowstatuflag;
+
+ /**
+ *
+ */
+ private String boutendflag;
+
+ /**
+ *
+ */
+ private String bsendendflag;
+
+ /**
+ *
+ */
+ private String blatestflag;
+
+ /**
+ *
+ */
+ private String vnote;
+
+ /**
+ *
+ */
+ private Long fioonwayownerflag;
+
+ /**
+ *
+ */
+ private Long fotonwayownerflag;
+
+ /**
+ *
+ */
+ private String conwayownerorgid;
+
+ /**
+ *
+ */
+ private String biosettleendflag;
+
+ /**
+ *
+ */
+ private BigDecimal noutnum;
+
+ /**
+ *
+ */
+ private BigDecimal ninnum;
+
+ /**
+ *
+ */
+ private String ts;
+
+ /**
+ *
+ */
+ private Integer dr;
+
+ /**
+ *
+ */
+ private String wmsMemo;
+
+ /**
+ *
+ */
+ private Integer wmsFlag;
+
+ /**
+ *
+ */
+ private String wlbm;
+
+ /**
+ *
+ */
+ private String vbatchcode;
+
+ @Override
+ public boolean equals(Object that) {
+ if (this == that) {
+ return true;
+ }
+ if (that == null) {
+ return false;
+ }
+ if (getClass() != that.getClass()) {
+ return false;
+ }
+ NccSaleDbddWms other = (NccSaleDbddWms) that;
+ return (this.getCbillid() == null ? other.getCbillid() == null : this.getCbillid().equals(other.getCbillid()))
+ && (this.getVbillcode() == null ? other.getVbillcode() == null : this.getVbillcode().equals(other.getVbillcode()))
+ && (this.getDbilldate() == null ? other.getDbilldate() == null : this.getDbilldate().equals(other.getDbilldate()))
+ && (this.getTaudittime() == null ? other.getTaudittime() == null : this.getTaudittime().equals(other.getTaudittime()))
+ && (this.getDrkczzbm() == null ? other.getDrkczzbm() == null : this.getDrkczzbm().equals(other.getDrkczzbm()))
+ && (this.getDrkczzmc() == null ? other.getDrkczzmc() == null : this.getDrkczzmc().equals(other.getDrkczzmc()))
+ && (this.getDckczzbm() == null ? other.getDckczzbm() == null : this.getDckczzbm().equals(other.getDckczzbm()))
+ && (this.getDckczzmc() == null ? other.getDckczzmc() == null : this.getDckczzmc().equals(other.getDckczzmc()))
+ && (this.getDcbmbm() == null ? other.getDcbmbm() == null : this.getDcbmbm().equals(other.getDcbmbm()))
+ && (this.getDcbmmc() == null ? other.getDcbmmc() == null : this.getDcbmmc().equals(other.getDcbmmc()))
+ && (this.getDrbmbm() == null ? other.getDrbmbm() == null : this.getDrbmbm().equals(other.getDrbmbm()))
+ && (this.getDrbmmc() == null ? other.getDrbmmc() == null : this.getDrbmmc().equals(other.getDrbmmc()))
+ && (this.getDrckbm() == null ? other.getDrckbm() == null : this.getDrckbm().equals(other.getDrckbm()))
+ && (this.getDrckmc() == null ? other.getDrckmc() == null : this.getDrckmc().equals(other.getDrckmc()))
+ && (this.getDcckbm() == null ? other.getDcckbm() == null : this.getDcckbm().equals(other.getDcckbm()))
+ && (this.getDcckmc() == null ? other.getDcckmc() == null : this.getDcckmc().equals(other.getDcckmc()))
+ && (this.getZdw() == null ? other.getZdw() == null : this.getZdw().equals(other.getZdw()))
+ && (this.getZsl() == null ? other.getZsl() == null : this.getZsl().equals(other.getZsl()))
+ && (this.getFdw() == null ? other.getFdw() == null : this.getFdw().equals(other.getFdw()))
+ && (this.getFsl() == null ? other.getFsl() == null : this.getFsl().equals(other.getFsl()))
+ && (this.getYfwfzsl() == null ? other.getYfwfzsl() == null : this.getYfwfzsl().equals(other.getYfwfzsl()))
+ && (this.getFstatusflag() == null ? other.getFstatusflag() == null : this.getFstatusflag().equals(other.getFstatusflag()))
+ && (this.getFrowstatuflag() == null ? other.getFrowstatuflag() == null : this.getFrowstatuflag().equals(other.getFrowstatuflag()))
+ && (this.getBoutendflag() == null ? other.getBoutendflag() == null : this.getBoutendflag().equals(other.getBoutendflag()))
+ && (this.getBsendendflag() == null ? other.getBsendendflag() == null : this.getBsendendflag().equals(other.getBsendendflag()))
+ && (this.getBlatestflag() == null ? other.getBlatestflag() == null : this.getBlatestflag().equals(other.getBlatestflag()))
+ && (this.getVnote() == null ? other.getVnote() == null : this.getVnote().equals(other.getVnote()))
+ && (this.getFioonwayownerflag() == null ? other.getFioonwayownerflag() == null : this.getFioonwayownerflag().equals(other.getFioonwayownerflag()))
+ && (this.getFotonwayownerflag() == null ? other.getFotonwayownerflag() == null : this.getFotonwayownerflag().equals(other.getFotonwayownerflag()))
+ && (this.getConwayownerorgid() == null ? other.getConwayownerorgid() == null : this.getConwayownerorgid().equals(other.getConwayownerorgid()))
+ && (this.getBiosettleendflag() == null ? other.getBiosettleendflag() == null : this.getBiosettleendflag().equals(other.getBiosettleendflag()))
+ && (this.getNoutnum() == null ? other.getNoutnum() == null : this.getNoutnum().equals(other.getNoutnum()))
+ && (this.getNinnum() == null ? other.getNinnum() == null : this.getNinnum().equals(other.getNinnum()))
+ && (this.getTs() == null ? other.getTs() == null : this.getTs().equals(other.getTs()))
+ && (this.getDr() == null ? other.getDr() == null : this.getDr().equals(other.getDr()))
+ && (this.getWmsMemo() == null ? other.getWmsMemo() == null : this.getWmsMemo().equals(other.getWmsMemo()))
+ && (this.getWmsFlag() == null ? other.getWmsFlag() == null : this.getWmsFlag().equals(other.getWmsFlag()))
+ && (this.getWlbm() == null ? other.getWlbm() == null : this.getWlbm().equals(other.getWlbm()))
+ && (this.getVbatchcode() == null ? other.getVbatchcode() == null : this.getVbatchcode().equals(other.getVbatchcode()));
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((getCbillid() == null) ? 0 : getCbillid().hashCode());
+ result = prime * result + ((getVbillcode() == null) ? 0 : getVbillcode().hashCode());
+ result = prime * result + ((getDbilldate() == null) ? 0 : getDbilldate().hashCode());
+ result = prime * result + ((getTaudittime() == null) ? 0 : getTaudittime().hashCode());
+ result = prime * result + ((getDrkczzbm() == null) ? 0 : getDrkczzbm().hashCode());
+ result = prime * result + ((getDrkczzmc() == null) ? 0 : getDrkczzmc().hashCode());
+ result = prime * result + ((getDckczzbm() == null) ? 0 : getDckczzbm().hashCode());
+ result = prime * result + ((getDckczzmc() == null) ? 0 : getDckczzmc().hashCode());
+ result = prime * result + ((getDcbmbm() == null) ? 0 : getDcbmbm().hashCode());
+ result = prime * result + ((getDcbmmc() == null) ? 0 : getDcbmmc().hashCode());
+ result = prime * result + ((getDrbmbm() == null) ? 0 : getDrbmbm().hashCode());
+ result = prime * result + ((getDrbmmc() == null) ? 0 : getDrbmmc().hashCode());
+ result = prime * result + ((getDrckbm() == null) ? 0 : getDrckbm().hashCode());
+ result = prime * result + ((getDrckmc() == null) ? 0 : getDrckmc().hashCode());
+ result = prime * result + ((getDcckbm() == null) ? 0 : getDcckbm().hashCode());
+ result = prime * result + ((getDcckmc() == null) ? 0 : getDcckmc().hashCode());
+ result = prime * result + ((getZdw() == null) ? 0 : getZdw().hashCode());
+ result = prime * result + ((getZsl() == null) ? 0 : getZsl().hashCode());
+ result = prime * result + ((getFdw() == null) ? 0 : getFdw().hashCode());
+ result = prime * result + ((getFsl() == null) ? 0 : getFsl().hashCode());
+ result = prime * result + ((getYfwfzsl() == null) ? 0 : getYfwfzsl().hashCode());
+ result = prime * result + ((getFstatusflag() == null) ? 0 : getFstatusflag().hashCode());
+ result = prime * result + ((getFrowstatuflag() == null) ? 0 : getFrowstatuflag().hashCode());
+ result = prime * result + ((getBoutendflag() == null) ? 0 : getBoutendflag().hashCode());
+ result = prime * result + ((getBsendendflag() == null) ? 0 : getBsendendflag().hashCode());
+ result = prime * result + ((getBlatestflag() == null) ? 0 : getBlatestflag().hashCode());
+ result = prime * result + ((getVnote() == null) ? 0 : getVnote().hashCode());
+ result = prime * result + ((getFioonwayownerflag() == null) ? 0 : getFioonwayownerflag().hashCode());
+ result = prime * result + ((getFotonwayownerflag() == null) ? 0 : getFotonwayownerflag().hashCode());
+ result = prime * result + ((getConwayownerorgid() == null) ? 0 : getConwayownerorgid().hashCode());
+ result = prime * result + ((getBiosettleendflag() == null) ? 0 : getBiosettleendflag().hashCode());
+ result = prime * result + ((getNoutnum() == null) ? 0 : getNoutnum().hashCode());
+ result = prime * result + ((getNinnum() == null) ? 0 : getNinnum().hashCode());
+ result = prime * result + ((getTs() == null) ? 0 : getTs().hashCode());
+ result = prime * result + ((getDr() == null) ? 0 : getDr().hashCode());
+ result = prime * result + ((getWmsMemo() == null) ? 0 : getWmsMemo().hashCode());
+ result = prime * result + ((getWmsFlag() == null) ? 0 : getWmsFlag().hashCode());
+ result = prime * result + ((getWlbm() == null) ? 0 : getWlbm().hashCode());
+ result = prime * result + ((getVbatchcode() == null) ? 0 : getVbatchcode().hashCode());
+ return result;
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append(getClass().getSimpleName());
+ sb.append(" [");
+ sb.append("Hash = ").append(hashCode());
+ sb.append(", cbillid=").append(cbillid);
+ sb.append(", vbillcode=").append(vbillcode);
+ sb.append(", dbilldate=").append(dbilldate);
+ sb.append(", taudittime=").append(taudittime);
+ sb.append(", drkczzbm=").append(drkczzbm);
+ sb.append(", drkczzmc=").append(drkczzmc);
+ sb.append(", dckczzbm=").append(dckczzbm);
+ sb.append(", dckczzmc=").append(dckczzmc);
+ sb.append(", dcbmbm=").append(dcbmbm);
+ sb.append(", dcbmmc=").append(dcbmmc);
+ sb.append(", drbmbm=").append(drbmbm);
+ sb.append(", drbmmc=").append(drbmmc);
+ sb.append(", drckbm=").append(drckbm);
+ sb.append(", drckmc=").append(drckmc);
+ sb.append(", dcckbm=").append(dcckbm);
+ sb.append(", dcckmc=").append(dcckmc);
+ sb.append(", zdw=").append(zdw);
+ sb.append(", zsl=").append(zsl);
+ sb.append(", fdw=").append(fdw);
+ sb.append(", fsl=").append(fsl);
+ sb.append(", yfwfzsl=").append(yfwfzsl);
+ sb.append(", fstatusflag=").append(fstatusflag);
+ sb.append(", frowstatuflag=").append(frowstatuflag);
+ sb.append(", boutendflag=").append(boutendflag);
+ sb.append(", bsendendflag=").append(bsendendflag);
+ sb.append(", blatestflag=").append(blatestflag);
+ sb.append(", vnote=").append(vnote);
+ sb.append(", fioonwayownerflag=").append(fioonwayownerflag);
+ sb.append(", fotonwayownerflag=").append(fotonwayownerflag);
+ sb.append(", conwayownerorgid=").append(conwayownerorgid);
+ sb.append(", biosettleendflag=").append(biosettleendflag);
+ sb.append(", noutnum=").append(noutnum);
+ sb.append(", ninnum=").append(ninnum);
+ sb.append(", ts=").append(ts);
+ sb.append(", dr=").append(dr);
+ sb.append(", wmsMemo=").append(wmsMemo);
+ sb.append(", wmsFlag=").append(wmsFlag);
+ sb.append(", wlbm=").append(wlbm);
+ sb.append(", vbatchcode=").append(vbatchcode);
+ sb.append("]");
+ return sb.toString();
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/zy/nc/mapper/NccSaleDbddWmsMapper.java b/src/main/java/com/zy/nc/mapper/NccSaleDbddWmsMapper.java
new file mode 100644
index 0000000..cd46698
--- /dev/null
+++ b/src/main/java/com/zy/nc/mapper/NccSaleDbddWmsMapper.java
@@ -0,0 +1,21 @@
+package com.zy.nc.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.nc.entity.NccSaleDbddWms;
+
+import java.util.List;
+
+/**
+* @author zc857
+* @description 閽堝琛ㄣ�恘cc_sale_dbdd_wms銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2025-05-21 16:04:17
+* @Entity com.zy.nc.entity.NccSaleDbddWms
+*/
+public interface NccSaleDbddWmsMapper extends BaseMapper<NccSaleDbddWms> {
+
+ List<String> selectDbdd();
+}
+
+
+
+
diff --git a/src/main/java/com/zy/nc/service/NccSaleDbddWmsService.java b/src/main/java/com/zy/nc/service/NccSaleDbddWmsService.java
new file mode 100644
index 0000000..3905b64
--- /dev/null
+++ b/src/main/java/com/zy/nc/service/NccSaleDbddWmsService.java
@@ -0,0 +1,16 @@
+package com.zy.nc.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.zy.nc.entity.NccSaleDbddWms;
+
+import java.util.List;
+
+/**
+* @author zc857
+* @description 閽堝琛ㄣ�恘cc_sale_dbdd_wms銆戠殑鏁版嵁搴撴搷浣淪ervice
+* @createDate 2025-05-21 16:04:17
+*/
+public interface NccSaleDbddWmsService extends IService<NccSaleDbddWms> {
+
+ List<String> selectDbdd();
+}
diff --git a/src/main/java/com/zy/nc/service/impl/NccSaleDbddWmsServiceImpl.java b/src/main/java/com/zy/nc/service/impl/NccSaleDbddWmsServiceImpl.java
new file mode 100644
index 0000000..4a64a24
--- /dev/null
+++ b/src/main/java/com/zy/nc/service/impl/NccSaleDbddWmsServiceImpl.java
@@ -0,0 +1,29 @@
+package com.zy.nc.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.nc.entity.NccSaleDbddWms;
+import com.zy.nc.service.NccSaleDbddWmsService;
+import com.zy.nc.mapper.NccSaleDbddWmsMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+* @author zc857
+* @description 閽堝琛ㄣ�恘cc_sale_dbdd_wms銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+* @createDate 2025-05-21 16:04:17
+*/
+@Service
+public class NccSaleDbddWmsServiceImpl extends ServiceImpl<NccSaleDbddWmsMapper, NccSaleDbddWms>
+ implements NccSaleDbddWmsService{
+
+ @Override
+ public List<String> selectDbdd() {
+ return this.baseMapper.selectDbdd();
+ }
+}
+
+
+
+
diff --git a/src/main/java/com/zy/nc/task/PlanOrderTask.java b/src/main/java/com/zy/nc/task/PlanOrderTask.java
index 804312e..7c29060 100644
--- a/src/main/java/com/zy/nc/task/PlanOrderTask.java
+++ b/src/main/java/com/zy/nc/task/PlanOrderTask.java
@@ -2,14 +2,8 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.zy.asrs.task.core.ReturnT;
-import com.zy.nc.entity.NccCgCgdhdWms;
-import com.zy.nc.entity.NccCkPddWms;
-import com.zy.nc.entity.NccSaleXsfhmxWms;
-import com.zy.nc.entity.NccScZkmxbWms;
-import com.zy.nc.service.NccCgCgdhdWmsService;
-import com.zy.nc.service.NccCkPddWmsService;
-import com.zy.nc.service.NccSaleXsfhmxWmsService;
-import com.zy.nc.service.NccScZkmxbWmsService;
+import com.zy.nc.entity.*;
+import com.zy.nc.service.*;
import com.zy.nc.task.handler.PlanOrderHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +28,9 @@
@Autowired
private NccCgCgdhdWmsService nccCgCgdhdWmsService;
+
+ @Autowired
+ private NccSaleDbddWmsService nccSaleDbddWmsService;
@Autowired
private NccCkPddWmsService nccCkPddWmsService;
@@ -105,6 +102,29 @@
}
/**
+ * 璋冩嫧鍑哄簱
+ *
+ * @return
+ */
+ @Scheduled(cron = "0/3 * * * * ? ")
+ public void execute5() {
+ List<String> strings = nccSaleDbddWmsService.selectDbdd();
+ for (String string : strings) {
+ List<NccSaleDbddWms> wmsFlag = nccSaleDbddWmsService.selectList(new EntityWrapper<NccSaleDbddWms>().eq("vbillcode", string).ne("wms_flag", 1));
+ ReturnT<String> returnT = planOrderHandler.start5(wmsFlag);
+ if (!returnT.isSuccess()) {
+ for (NccSaleDbddWms wms : wmsFlag) {
+ wms.setWmsMemo(returnT.getMsg());
+ nccSaleDbddWmsService.updateById(wms);
+ }
+ log.error(returnT.getMsg());
+ }
+ }
+
+ }
+
+
+ /**
* 鐩樼偣鍗�
*
* @return
@@ -113,7 +133,7 @@
public void execute4() {
List<String> strings = nccCkPddWmsService.selectPdd();
for (String string : strings) {
- List<NccCkPddWms> wmsFlag = nccCkPddWmsService.selectList(new EntityWrapper<NccCkPddWms>().eq("vbillcode", string).ne("wms_flag", 1));
+ List<NccCkPddWms> wmsFlag = nccCkPddWmsService.selectList(new EntityWrapper<NccCkPddWms>().eq("vbillcode", string).ne("wms_flag", 1).eq("hdr",0).eq("bdr",0));
ReturnT<String> returnT = planOrderHandler.start4(wmsFlag);
if (!returnT.isSuccess()) {
for (NccCkPddWms wms : wmsFlag) {
diff --git a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
index 07cb971..7160b6a 100644
--- a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
@@ -16,14 +16,8 @@
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.model.DetlDto;
-import com.zy.nc.entity.NccCgCgdhdWms;
-import com.zy.nc.entity.NccCkPddWms;
-import com.zy.nc.entity.NccSaleXsfhmxWms;
-import com.zy.nc.entity.NccScZkmxbWms;
-import com.zy.nc.service.NccCgCgdhdWmsService;
-import com.zy.nc.service.NccCkPddWmsService;
-import com.zy.nc.service.NccSaleXsfhmxWmsService;
-import com.zy.nc.service.NccScZkmxbWmsService;
+import com.zy.nc.entity.*;
+import com.zy.nc.service.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -44,6 +38,9 @@
@Autowired
private NccCgCgdhdWmsService nccCgCgdhdWmsService;
+
+ @Autowired
+ private NccSaleDbddWmsService nccSaleDbddWmsService;
@Autowired
private NccCkPddWmsService nccCkPddWmsService;
@@ -98,25 +95,26 @@
}
/**
- * 杞簱
+ * 杞簱锛屽寘鍚骇鎴愬搧鍏ュ簱鍗�
*
* @return
*/
public ReturnT<String> start2(List<NccScZkmxbWms> wmsFlag) {
try {
- OpenOrderPakoutParam param = new OpenOrderPakoutParam();
+ OpenOrderPakinParam param = new OpenOrderPakinParam();
param.setOrderType("杞簱");
DetlDto detlDto;
List<DetlDto> orderDetails = new ArrayList<>();
long i = 1;
for (NccScZkmxbWms nccScZkmxbWms : wmsFlag) {
log.info("NccScZkmxbWms鏁版嵁:{}", JSONObject.toJSON(nccScZkmxbWms));
- if (nccScZkmxbWms.getDjzt() == 2 && nccScZkmxbWms.getBdr() == 0 && nccScZkmxbWms.getDr() == 0) {
+ if ( nccScZkmxbWms.getBdr() == 0 && nccScZkmxbWms.getDr() == 0) {
detlDto = new DetlDto();
detlDto.setMatnr(nccScZkmxbWms.getWlbm());
detlDto.setAnfme(nccScZkmxbWms.getYingzzsl().doubleValue());
detlDto.setBatch(nccScZkmxbWms.getVbatchcode());
detlDto.setLineNumber(i);
+ detlDto.setRemark(JSONObject.toJSONString(nccScZkmxbWms));
orderDetails.add(detlDto);
i++;
}
@@ -124,7 +122,7 @@
param.setOrderNo(nccScZkmxbWms.getVbillcode());
}
param.setOrderDetails(orderDetails);
- openService.pakoutOrderCreate(param);
+ openService.pakinOrderCreate(param);
nccScZkmxbWmsService.updateBatchById(wmsFlag);
} catch (Exception e) {
e.printStackTrace();
@@ -147,18 +145,19 @@
DetlDto detlDto;
List<DetlDto> orderDetails = new ArrayList<>();
long i = 1;
- for (NccCgCgdhdWms nccScZkmxbWms : wmsFlag) {
- log.info("NccCgCgdhdWms鏁版嵁:{}", JSONObject.toJSON(nccScZkmxbWms));
- if (nccScZkmxbWms.getBdr() == 0 && nccScZkmxbWms.getHdr() == 0) {
+ for (NccCgCgdhdWms nccCgCgdhdWms : wmsFlag) {
+ log.info("nccCgCgdhdWms鏁版嵁:{}", JSONObject.toJSON(nccCgCgdhdWms));
+ if (nccCgCgdhdWms.getBdr() == 0 && nccCgCgdhdWms.getHdr() == 0) {
detlDto = new DetlDto();
- detlDto.setMatnr(nccScZkmxbWms.getWlbm());
- detlDto.setAnfme(nccScZkmxbWms.getYdzsl().doubleValue());
+ detlDto.setMatnr(nccCgCgdhdWms.getWlbm());
+ detlDto.setAnfme(nccCgCgdhdWms.getYdzsl().doubleValue());
detlDto.setLineNumber(i);
+ detlDto.setRemark(JSONObject.toJSONString(nccCgCgdhdWms));
orderDetails.add(detlDto);
i++;
}
- nccScZkmxbWms.setWmsFlag(1);
- param.setOrderNo(nccScZkmxbWms.getVbillcode());
+ nccCgCgdhdWms.setWmsFlag(1);
+ param.setOrderNo(nccCgCgdhdWms.getVbillcode());
}
param.setOrderDetails(orderDetails);
openService.pakinOrderCreate(param);
@@ -188,13 +187,13 @@
if (Cools.isEmpty(mat)) {
throw new CoolException(nccScZkmxbWms.getWlbm() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
}
- List<InventoryCheckOrderDetl> checkOrderDetls = inventoryCheckOrderDetlService.selectList(new EntityWrapper<InventoryCheckOrderDetl>().eq("order_no", nccScZkmxbWms.getVbillcode()).eq("matnr", mat.getMatnr()));
- if (checkOrderDetls == null || checkOrderDetls.isEmpty()) {
+ List<InventoryCheckOrderDetl> checkOrderDetls = inventoryCheckOrderDetlService.selectList(new EntityWrapper<InventoryCheckOrderDetl>().eq("order_no", nccScZkmxbWms.getVbillcode()).eq("matnr", mat.getMatnr()).eq("batch", nccScZkmxbWms.getVbatchcode()));
+ if (checkOrderDetls != null && !checkOrderDetls.isEmpty()) {
throw new CoolException(nccScZkmxbWms.getWlbm() + "鐩樼偣鍗曠殑鏄庣粏閲嶅浜�");
}
checkOrderDetl = new InventoryCheckOrderDetl();
checkOrderDetl.setMatnr(nccScZkmxbWms.getWlbm());
- checkOrderDetl.setMaktx(mat.getMatnr());
+ checkOrderDetl.setMaktx(mat.getMaktx());
checkOrderDetl.setOrderNo(nccScZkmxbWms.getVbillcode());
checkOrderDetl.setAnfme(nccScZkmxbWms.getZmzsl().doubleValue());
checkOrderDetl.setBatch(nccScZkmxbWms.getVbatchcode());
@@ -215,4 +214,42 @@
}
+
+ /**
+ * 璋冩嫧鍗�
+ *
+ * @return
+ */
+ public ReturnT<String> start5(List<NccSaleDbddWms> wmsFlag) {
+ try {
+ OpenOrderPakoutParam param = new OpenOrderPakoutParam();
+ param.setOrderType("闆嗗洟鍐呴儴璋冩嫧");
+ DetlDto detlDto;
+ List<DetlDto> orderDetails = new ArrayList<>();
+ long i = 1;
+ for (NccSaleDbddWms nccCgCgdhdWms : wmsFlag) {
+ log.info("nccCgCgdhdWms鏁版嵁:{}", JSONObject.toJSON(nccCgCgdhdWms));
+ if (nccCgCgdhdWms.getDr() == 0 ) {
+ detlDto = new DetlDto();
+ detlDto.setMatnr(nccCgCgdhdWms.getWlbm());
+ detlDto.setAnfme(nccCgCgdhdWms.getZsl().doubleValue());
+ detlDto.setBatch(nccCgCgdhdWms.getVbatchcode());
+ detlDto.setLineNumber(i);
+ detlDto.setRemark(JSONObject.toJSONString(nccCgCgdhdWms));
+ orderDetails.add(detlDto);
+ i++;
+ }
+ nccCgCgdhdWms.setWmsFlag(1);
+ param.setOrderNo(nccCgCgdhdWms.getVbillcode());
+ }
+ param.setOrderDetails(orderDetails);
+ openService.pakoutOrderCreate(param);
+ nccSaleDbddWmsService.updateBatchById(wmsFlag);
+ } catch (Exception e) {
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ }
+ return SUCCESS;
+ }
}
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
index 7eb9cf5..be4f13b 100644
--- a/src/main/java/com/zy/nc/vo/ic_purchasein_b.java
+++ b/src/main/java/com/zy/nc/vo/ic_purchasein_b.java
@@ -12,74 +12,179 @@
/**
- * 搴撳瓨缁勭粐鏈�鏂扮増鏈紙蹇呭～锛�
+ * 鐗╂枡缂栫爜锛堝繀濉級
*/
- private String pk_org;
+ private String cmaterialvid;
/**
- * 浠撳簱锛堝繀濉級
+ * 搴旀敹鏁伴噺锛堝繀濉級
*/
- private String cwarehouseid;
+ private Double nshouldassistnum;
/**
- * 绛惧瓧浜�
+ * 宸茬敓鎴愯澶囧崱鐗�
*/
- private String approver;
+ private String bassetcard;
/**
- * 鍒跺崟浜�
+ * 宸茶浆鍥�
*/
- private String billmaker;
+ private String bfixedasset;
/**
- * 杩涘彛鍏ュ簱鍗�
+ * 閫嗗悜寰佺◣鏍囧織
*/
- private String bitinbill;
+ private String bopptaxflag;
/**
- * 涓夎璐告槗
+ * 鍊熷叆杞噰璐�
*/
- private String btriatradeflag;
+ private String borrowinflag;
/**
- * 閲囪喘鍛�
+ * 涓婃父璧犲搧琛�
*/
- private String cbizid;
+ private String bsourcelargess;
/**
- * 涓氬姟娴佺▼
+ * 鏉ユ簮鍒拌揣鍗曡川妫�鏄庣粏涓婚敭
*/
- private String cbiztype;
+ private String carriveorder_bbid;
/**
- * 缁撶畻鎴愭湰鍩�
+ * 鍗曟嵁琛屾槸鍚︽潯鐮佸叧闂�
*/
- private String ccostdomainid;
+ private Boolean bbarcodeclose;
/**
- * 鏀惰揣瀹㈡埛
+ * 鏄惁宸蹭紶瀛樿揣鏍哥畻
*/
- private String ccustomerid;
+ private Boolean bhasiabill;
/**
- * 閲囪喘閮ㄩ棬鏈�鏂扮増鏈�
+ * 鏄惁鍦ㄩ��
*/
- private String cdptid;
+ private Boolean bonroadflag;
/**
- * 閲囪喘閮ㄩ棬
+ * 瀹㈡埛
*/
- private String cdptvid;
+ private String casscustid;
/**
- * 缁撶畻璐㈠姟缁勭粐鏈�鏂扮増鏈�
+ * 鍗曚綅
*/
- private String cfanaceorgoid;
+ private String castunitid;
+
+ /**
+ * 鍑哄叆搴撶被鍨�
+ */
+ private String cbodytranstypecode;
+
+ /**
+ * 搴撳瓨浠撳簱
+ */
+ private String cbodywarehouseid;
+
+ /**
+ * 璐ㄦ鐘舵��
+ */
+ private String ccheckstateid;
+
+ /**
+ * 瀵瑰簲鍏ュ簱鍗曡〃浣撲富閿�
+ */
+ private String ccorrespondbid;
+
+ /**
+ * 瀵瑰簲鍏ュ簱鍗曞崟鎹彿
+ */
+ private String ccorrespondcode;
+
+ /**
+ * 瀵瑰簲鍏ュ簱鍗曚富閿�
+ */
+ private String ccorrespondhid;
+
+ /**
+ * 瀵瑰簲鍏ュ簱鍗曡鍙�
+ */
+ private String ccorrespondrowno;
+
+ /**
+ * 瀵瑰簲鍏ュ簱鍗曚氦鏄撶被鍨�
+ */
+ private String ccorrespondtranstype;
+
+ /**
+ * 瀵瑰簲鍏ュ簱鍗曠被鍨�
+ */
+ private String ccorrespondtype;
+
+ /**
+ * 鏈綅甯�
+ */
+ private String ccurrencyid;
+
+ /**
+ * 鐩殑鍦板尯
+ */
+ private String cdestiareaid;
+
+ /**
+ * 鐩殑鍥�
+ */
+ private String cdesticountryid;
+
+ /**
+ * 杩涘彛鏄庣粏鍗曡涓婚敭
+ */
+ private String cdetailbid;
+
+ /**
+ * 杩涘彛鏄庣粏鍗曚富閿�
+ */
+ private String cdetailid;
+
+ /**
+ * 杩涘彛鏄庣粏鍗曡鍙�
+ */
+ private String cdetailrowno;
+
+ /**
+ * 鍑哄彛鏄庣粏鎷ｉ厤涓婚敭
+ */
+ private String cetdetlpickbid;
/**
* 缁撶畻璐㈠姟缁勭粐
*/
- private String cfanaceorgvid;
+ private String cfanaceorgoid;
+
+ /**
+ * 鐗瑰緛鐮�
+ */
+ private String cffileid;
+
+ /**
+ * 婧愬ご鍗曟嵁琛ㄤ綋涓婚敭
+ */
+ private String cfirstbillbid;
+
+ /**
+ * 婧愬ご鍗曟嵁琛ㄥご涓婚敭
+ */
+ private String cfirstbillhid;
+
+ /**
+ * 婧愬ご鍗曟嵁浜ゆ槗绫诲瀷
+ */
+ private String cfirsttranstype;
+
+ /**
+ * 婧愬ご鍗曟嵁绫诲瀷
+ */
+ private String cfirsttype;
/**
* 鍏ュ簱鍗曡〃浣撲富閿�
@@ -87,9 +192,54 @@
private String cgeneralbid;
/**
- * 鍏ュ簱鍗曡〃澶翠富閿�
+ * 鍏ㄥ眬鏈綅甯�
*/
- private String cgeneralhid;
+ private String cglobalcurrencyid;
+
+ /**
+ * 闆嗗洟鏈綅甯�
+ */
+ private String cgroupcurrencyid;
+
+ /**
+ * 鏀惰揣鍒╂鼎涓績
+ */
+ private String cioliabilityoid;
+
+ /**
+ * 鏀惰揣鍒╂鼎涓績锛圴ID锛�
+ */
+ private String cioliabilityvid;
+
+ /**
+ * 缁撶畻鍒╂鼎涓績
+ */
+ private String cliabilityoid;
+
+ /**
+ * 缁撶畻鍒╂鼎涓績锛圴ID锛�
+ */
+ private String cliabilityvid;
+
+ /**
+ * 璐т綅
+ */
+ private String clocationid;
+
+ /**
+ * 婧愬ご閲囪喘鍗曟嵁鍒拌揣璁″垝
+ */
+ private String corder_bb1id;
+
+ /**
+ * 鍘熶骇鍦板尯
+ */
+ private String corigareaid;
+
+ /**
+ * 鍘熶骇鍥�
+ */
+ private String corigcountryid;
/**
* 鍏徃鏈�鏂扮増鏈�
@@ -102,64 +252,144 @@
private String corpvid;
/**
- * 搴斾粯璐㈠姟缁勭粐鏈�鏂扮増鏈�
+ * 鐢熶骇鍘傚晢
*/
- private String cpayfinorgoid;
+ private String cproductorid;
/**
- * 搴斾粯璐㈠姟缁勭粐
+ * 椤圭洰
*/
- private String cpayfinorgvid;
+ private String cprojectid;
/**
- * 閲囪喘缁勭粐
+ * 椤圭洰浠诲姟
*/
- private String cpurorgoid;
+ private String cprojecttaskid;
/**
- * 閲囪喘缁勭粐鏈�鏂扮増鏈�
+ * 鎶ヤ环鍗曚綅
*/
- private String cpurorgvid;
+ private String cqtunitid;
/**
- * 鍒涘缓鏃堕棿
+ * 璐ㄩ噺绛夌骇
*/
- private Date creationtime;
+ private String cqualitylevelid;
+
+// /**
+// * 鏀惰揣鍒╂鼎涓績
+// */
+// private String cioliabilityoid;
+//
+// /**
+// * 鏀惰揣鍒╂鼎涓績锛圴ID锛�
+// */
+// private String cioliabilityvid;
/**
- * 鍒涘缓浜�
+ * 闇�姹傚簱瀛樼粍缁囨渶鏂扮増鏈�
*/
- private String creator;
+ private String creqstoorgoid;
/**
- * 鏀惰揣鍥�
+ * 闇�姹傚簱瀛樼粍缁�
*/
- private String crececountryid;
+ private String creqstoorgvid;
/**
- * 鍙戣揣鍥�
+ * 琛屽彿
*/
- private String csendcountryid;
+ private String crowno;
/**
- * 杩愯緭鏂瑰紡
+ * 閫夋嫨鎷嗚В鍗曚綅
*/
- private String csendtypeid;
+ private String cselastunitid;
/**
- * 鎶ョ◣鍥�
+ * 缁撶畻甯佺
*/
- private String ctaxcountryid;
+ private String csettlecurrencyid;
/**
- * 璐告槗鏈
+ * 搴忓垪鍙疯川閲忕瓑绾�
*/
- private String ctradewordid;
+ private String csnqualitylevelid;
/**
- * 鍑哄叆搴撶被鍨�
+ * 搴忓垪鍙峰崟浣�
*/
- private String ctrantypeid;
+ 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 csrcmaterialoid;
+
+ /**
+ * 鏉ユ簮鐗╂枡缂栫爜
+ */
+ private String csrcmaterialvid;
+
+ /**
+ * 搴撳瓨鐘舵��
+ */
+ private String cstateid;
+
+ /**
+ * 绋庣爜
+ */
+ private String ctaxcodeid;
+
+ /**
+ * 璐т富瀹㈡埛
+ */
+ private String ctplcustomerid;
+
+ /**
+ * 涓诲崟浣�
+ */
+ private String cunitid;
/**
* 渚涘簲鍟�
@@ -167,69 +397,374 @@
private String cvendorid;
/**
- * 搴撶鍛�
+ * 瀵勫瓨渚涘簲鍟�
*/
- private String cwhsmanagerid;
+ private String cvmivenderid;
/**
- * 鍗曟嵁鏃ユ湡
+ * 鍏ュ簱鏃ユ湡
*/
- private Date dbilldate;
+ private Date dbizdate;
/**
- * 鍒跺崟鏃ユ湡
+ * 棣栨鍏ュ簱鏃ユ湡
*/
- private Date dmakedate;
+ private Date dinbounddate;
/**
- * 鍗曟嵁鐘舵��
+ * 鐢熶骇鏃ユ湡
*/
- private Boolean fbillflag;
+ private Date dproducedate;
/**
- * 璐攢绫诲瀷
+ * 澶辨晥鏃ユ湡
*/
- private Boolean fbuysellflag;
+ private Date dvalidate;
/**
- * 閲囪喘閫�搴�
+ * 閰嶅鏍囧織
*/
- private Boolean freplenishflag;
+ private Integer fbillrowflag;
/**
- * 鎵撳嵃娆℃暟
+ * 寰呮鏍囧織
*/
- private Integer iprintcount;
+ private Integer fchecked;
/**
- * 鏈�鍚庝慨鏀规椂闂�
+ * 璧犲搧
*/
- private Date modifiedtime;
+ private String flargess;
/**
- * 鏈�鍚庝慨鏀逛汉
+ * 鎵ｇ◣绫诲埆
*/
- private String modifier;
+ private Integer ftaxtypeflag;
/**
- * 鎬绘暟閲�
+ * 鎵规鐗堟湰
*/
- private Double ntotalnum;
+ private Integer ibcversion;
/**
- * 鎬讳欢鏁�
+ * 鎷嗚В绫诲瀷
*/
- private Double ntotalpiece;
+ private Integer idesatype;
/**
- * 鎬讳綋绉�
+ * 绱缁撶畻鏁伴噺
*/
- private Double ntotalvolume;
+ private Double naccumsettlenum;
/**
- * 鎬婚噸閲�
+ * 绱杞皟鎷ㄦ暟閲�
*/
- private Double ntotalweight;
+ private Double naccumtonum;
+
+ /**
+ * 绱姹囨�诲尮閰嶄富鏁伴噺
+ */
+ private Double naccumvminum;
+
+ /**
+ * 瀹炴敹鏁伴噺
+ */
+ private Double nassistnum;
+
+ /**
+ * 鏉＄爜涓绘暟閲�
+ */
+ private Double nbarcodenum;
+
+ /**
+ * 璁℃垚鏈噾棰�
+ */
+ private Double ncalcostmny;
+
+ /**
+ * 璁＄◣閲戦
+ */
+ private Double ncaltaxmny;
+
+ /**
+ * 鍙ˉ璐т富鏁伴噺
+ */
+ private Double ncanreplnum;
+
+ /**
+ * 鎶樻湰姹囩巼
+ */
+ private Double nchangestdrate;
+
+ /**
+ * 绱鍑哄簱鏁伴噺
+ */
+ private Double ncorrespondastnum;
+
+ /**
+ * 绱鍑哄簱姣涢噸涓绘暟閲�
+ */
+ private Double ncorrespondgrsnum;
+
+ /**
+ * 绱鍑哄簱涓绘暟閲�
+ */
+ private Double ncorrespondnum;
+
+ /**
+ * 绠辨暟
+ */
+ private Double ncountnum;
+
+ /**
+ * 鍏ㄥ眬鏈綅甯佹眹鐜�
+ */
+ private Double nglobalexchgrate;
+
+ /**
+ * 鍏ㄥ眬鏈竵鏃犵◣閲戦
+ */
+ private Double nglobalmny;
+
+ /**
+ * 闆嗗洟鏈綅甯佹眹鐜�
+ */
+ private Double ngroupexchgrate;
+
+ /**
+ * 闆嗗洟鏈竵鏃犵◣閲戦
+ */
+ private Double ngroupmny;
+
+ /**
+ * 鍙紑绁ㄩ噾棰�
+ */
+ private Double ninvoicemny;
+
+ /**
+ * 鍙紑绁ㄦ暟閲�
+ */
+ private Double ninvoicenum;
+
+ /**
+ * 鎶樻墸
+ */
+ private Double nitemdiscountrate;
+
+ /**
+ * 鎵ｅ惃涓绘暟閲�
+ */
+ private Double nkdnum;
+
+ /**
+ * 鏈竵鏃犵◣閲戦
+ */
+ private Double nmny;
+
+ /**
+ * 涓绘湰甯佹棤绋庡噣浠�
+ */
+ private Double nnetprice;
+
+ /**
+ * 涓嶅彲鎶垫墸绋庨
+ */
+ private Double nnosubtax;
+
+ /**
+ * 涓嶅彲鎶垫墸绋庣巼
+ */
+ private Double nnosubtaxrate;
+
+ /**
+ * 鏃犵◣閲戦
+ */
+ private Double norigmny;
+
+ /**
+ * 涓绘棤绋庡噣浠�
+ */
+ private Double norignetprice;
+
+ /**
+ * 涓绘棤绋庡崟浠�
+ */
+ private Double norigprice;
+
+ /**
+ * 浠风◣鍚堣
+ */
+ private Double norigtaxmny;
+
+ /**
+ * 涓诲惈绋庡噣浠�
+ */
+ private Double norigtaxnetprice;
+
+ /**
+ * 涓诲惈绋庡崟浠�
+ */
+ private Double npickupnum;
+
+ /**
+ * 绱鎷ｉ厤涓绘暟閲�
+ */
+ private Double norigtaxprice;
+
+ /**
+ * 绱鎷ｉ厤涓绘暟閲�
+ */
+ private Double norigtaxprice_2;
+
+ /**
+ * 涓绘湰甯佹棤绋庡崟浠�
+ */
+ private Double nprice;
+
+ /**
+ * 鏈竵鏃犵◣鍑�浠�
+ */
+ private Double nqtnetprice;
+
+ /**
+ * 鏃犵◣鍑�浠�
+ */
+ private Double nqtorignetprice;
+
+ /**
+ * 鏃犵◣鍗曚环
+ */
+ private Double nqtorigprice;
+
+ /**
+ * 鍚◣鍑�浠�
+ */
+ private Double nqtorigtaxnetprice;
+
+ /**
+ * 鍚◣鍗曚环
+ */
+ private Double nqtorigtaxprice;
+
+ /**
+ * 鏈竵鏃犵◣鍗曚环
+ */
+ private Double nqtprice;
+
+ /**
+ * 鏈竵鍚◣鍑�浠�
+ */
+ private Double nqttaxnetprice;
+
+ /**
+ * 鏈竵鍚◣鍗曚环
+ */
+ private Double nqttaxprice;
+
+ /**
+ * 鎶ヤ环鏁伴噺
+ */
+ private Double nqtunitnum;
+
+ /**
+ * 绱閫�搴撹ˉ璐ф暟閲�
+ */
+ private Double nreplenishedastnum;
+
+ /**
+ * 绱閫�搴撹ˉ璐т富鏁伴噺
+ */
+ private Double nreplenishednum;
+
+ /**
+ * 缁撶畻浠锋牸
+ */
+ private Double nsettleprice;
+
+ /**
+ * 缁撶畻鏃犵◣浠锋牸
+ */
+ private Double nsettlepricenotax;
+
+ /**
+ * 閲戦
+ */
+ private Double ncostmny;
+
+ /**
+ * 鍗曚环
+ */
+ private Double ncostprice;
+
+ /**
+ * 绠辨暟
+ */
+ private Double ncountnum_2;
+
+ /**
+ * 璐圭敤缁撶畻娆℃暟
+ */
+ private Integer nfeesettlecount;
+
+ /**
+ * 姣涢噸涓绘暟閲�
+ */
+ private Double ngrossnum;
+
+ /**
+ * 瀹炴敹涓绘暟閲�
+ */
+ private Double nnum;
+
+ /**
+ * 浠舵暟
+ */
+ private Double npiece;
+
+ /**
+ * 璁″垝閲戦
+ */
+ private Double nplannedmny;
+
+ /**
+ * 璁″垝鍗曚环
+ */
+ private Double nplannedprice;
+
+ /**
+ * 搴旀敹涓绘暟閲�
+ */
+ private Double nshouldnum;
+
+ /**
+ * 搴旀敹鏁伴噺
+ */
+ private Double nshouldassistnum_2;
+
+ /**
+ * 鐨噸涓绘暟閲�
+ */
+ private Double ntarenum;
+
+ /**
+ * 绱鎷ｉ厤涓绘暟閲�
+ */
+ private Double ntotalpicknum;
+
+ /**
+ * 浣撶Н
+ */
+ private Double nvolume;
+
+ /**
+ * 閲嶉噺
+ */
+ private Double nweight;
+
+ /**
+ * 鎵规涓婚敭
+ */
+ private String pk_batchcode;
/**
* 闆嗗洟
@@ -242,46 +777,369 @@
private String pk_measware;
/**
+ * 搴撳瓨缁勭粐鏈�鏂扮増鏈�
+ */
+ private String pk_org;
+
+ /**
* 搴撳瓨缁勭粐
*/
private String pk_org_v;
/**
- * 绛惧瓧鏃ユ湡
+ * 鍖呰绫诲瀷
*/
- private Date taudittime;
+ private String pk_packsort;
/**
- * 鍗曟嵁鍙�
+ * 搴忓垪鍙蜂富閿�
*/
- 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 pk_serialcode;
/**
- * 澶囨敞
+ * 鎵规鏃堕棿鎴�
*/
- private String vnote;
+ private Date tbcts;
+
+ /**
+ * 妫�楠屾椂闂�
+ */
+ private Date tchecktime;
+
+ /**
+ * 鏉ユ簮琛ㄤ綋鏃堕棿鎴�
+ */
+ private Date tsourcebodyts;
+
+ /**
+ * 鏉ユ簮琛ㄥご鏃堕棿鎴�
+ */
+ private Date tsourceheadts;
+
+ /**
+ * 鎵规鍙�
+ */
+ private String vbatchcode;
+
+ /**
+ * 鎵规澶囨敞
+ */
+ private String vbatchcodenote;
+
+ /**
+ * 鎵规鑷畾涔夐」1
+ */
+ private String vbcdef1;
+
+ /**
+ * 鎵规鑷畾涔夐」2
+ */
+ private String vbcdef2;
+
+ /**
+ * 鎵规鑷畾涔夐」3
+ */
+ private String vbcdef3;
+
+ /**
+ * 鎵规鑷畾涔夐」4
+ */
+ private String vbcdef4;
+
+ /**
+ * 鎵规鑷畾涔夐」5
+ */
+ private String vbcdef5;
+
+ /**
+ * 鎵规鑷畾涔夐」6
+ */
+ private String vbcdef6;
+
+ /**
+ * 鎵规鑷畾涔夐」7
+ */
+ private String vbcdef7;
+
+ /**
+ * 鎵规鑷畾涔夐」8
+ */
+ private String vbcdef8;
+
+ /**
+ * 鎵规鑷畾涔夐」9
+ */
+ private String vbcdef9;
+
+ /**
+ * 鎵规鑷畾涔夐」10
+ */
+ private String vbcdef10;
+
+ /**
+ * 鎵规鑷畾涔夐」11
+ */
+ private String vbcdef11;
+
+ /**
+ * 鎵规鑷畾涔夐」12
+ */
+ private String vbcdef12;
+
+ /**
+ * 鎵规鑷畾涔夐」13
+ */
+ private String vbcdef13;
+
+ /**
+ * 鎵规鑷畾涔夐」14
+ */
+ private String vbcdef14;
+
+ /**
+ * 鎵规鑷畾涔夐」15
+ */
+ private String vbcdef15;
+
+ /**
+ * 鎵规鑷畾涔夐」16
+ */
+ private String vbcdef16;
+
+ /**
+ * 鎵规鑷畾涔夐」17
+ */
+ private String vbcdef17;
+
+ /**
+ * 鎵规鑷畾涔夐」18
+ */
+ private String vbcdef18;
+
+ /**
+ * 鎵规鑷畾涔夐」19
+ */
+ private String vbcdef19;
+
+ /**
+ * 鎵规鑷畾涔夐」20
+ */
+ private String vbcdef20;
+
+ /**
+ * 琛ㄤ綋鑷畾涔夐」1
+ */
+ private String vbdef1;
+
+ /**
+ * 琛ㄤ綋鑷畾涔夐」2
+ */
+ private String vbdef2;
+
+ /**
+ * 琛ㄤ綋鑷畾涔夐」3
+ */
+ private String vbdef3;
+
+ /**
+ * 琛ㄤ綋鑷畾涔夐」4
+ */
+ private String vbdef4;
+
+ /**
+ * 琛ㄤ綋鑷畾涔夐」5
+ */
+ private String vbdef5;
+
+ /**
+ * 琛ㄤ綋鑷畾涔夐」6
+ */
+ private String vbdef6;
+
+ /**
+ * 琛ㄤ綋鑷畾涔夐」7
+ */
+ private String vbdef7;
+
+ /**
+ * 琛ㄤ綋鑷畾涔夐」8
+ */
+ private String vbdef8;
+
+ /**
+ * 琛ㄤ綋鑷畾涔夐」9
+ */
+ private String vbdef9;
+
+ /**
+ * 琛ㄤ綋鑷畾涔夐」10
+ */
+ private String vbdef10;
+
+ /**
+ * 琛ㄤ綋鑷畾涔夐」11
+ */
+ private String vbdef11;
+
+ /**
+ * 琛ㄤ綋鑷畾涔夐」12
+ */
+ private String vbdef12;
+
+ /**
+ * 琛ㄤ綋鑷畾涔夐」13
+ */
+ private String vbdef13;
+
+ /**
+ * 琛ㄤ綋鑷畾涔夐」14
+ */
+ private String vbdef14;
+
+ /**
+ * 琛ㄤ綋鑷畾涔夐」15
+ */
+ private String vbdef15;
+
+ /**
+ * 琛ㄤ綋鑷畾涔夐」16
+ */
+ private String vbdef16;
+
+ /**
+ * 琛ㄤ綋鑷畾涔夐」17
+ */
+ private String vbdef17;
+
+ /**
+ * 琛ㄤ綋鑷畾涔夐」18
+ */
+ private String vbdef18;
+
+ /**
+ * 琛ㄤ綋鑷畾涔夐」19
+ */
+ private String vbdef19;
+
+ /**
+ * 琛ㄤ綋鑷畾涔夐」20
+ */
+ private String vbdef20;
+
+ /**
+ * 鍗曟嵁鏉＄爜
+ */
+ private String vbillbarcode;
+
+ /**
+ * 鏉ヨ嚜浜庨浂鍞箣鍗曟嵁绫诲瀷
+ */
+ private String vbilltypeu8rm;
+
+ /**
+ * 鎹㈢畻鐜�
+ */
+ private String vchangerate;
+
+ /**
+ * 杩涘彛鏄庣粏鍗曞彿
+ */
+ private String vdetailbillcode;
+
+ /**
+ * 绱ф�ユ斁琛岀敵璇峰崟琛屼富閿�
+ */
+ private String vexigencybid;
+
+ /**
+ * 绱ф�ユ斁琛岀敵璇峰崟鍙�
+ */
+ private String vexigencycode;
+
+ /**
+ * 绱ф�ユ斁琛岀敵璇峰崟涓婚敭
+ */
+ private String vexigencyhid;
+
+ /**
+ * 绱ф�ユ斁琛岀敵璇峰崟琛屽彿
+ */
+ private String vexigencyrowno;
+
+ /**
+ * 婧愬ご鍗曟嵁鍙�
+ */
+ private String vfirstbillcode;
+
+ /**
+ * 婧愬ご鍗曟嵁琛屽彿
+ */
+ private String vfirstrowno;
+
+ /**
+ * 鑷敱杈呭姪灞炴��1
+ */
+ private String vfree1;
+
+ /**
+ * 鑷敱杈呭姪灞炴��2
+ */
+ private String vfree2;
+
+ /**
+ * 鑷敱杈呭姪灞炴��3
+ */
+ private String vfree3;
+
+ /**
+ * 鑷敱杈呭姪灞炴��4
+ */
+ private String vfree4;
+
+ /**
+ * 鑷敱杈呭姪灞炴��5
+ */
+ private String vfree5;
+
+ /**
+ * 鑷敱杈呭姪灞炴��6
+ */
+ private String vfree6;
+
+ /**
+ * 鑷敱杈呭姪灞炴��7
+ */
+ private String vfree7;
+
+ /**
+ * 鑷敱杈呭姪灞炴��8
+ */
+ private String vfree8;
+
+ /**
+ * 鑷敱杈呭姪灞炴��9
+ */
+ private String vfree9;
+
+ /**
+ * 鑷敱杈呭姪灞炴��10
+ */
+ private String vfree10;
+
+ /**
+ * 琛屽娉�
+ */
+ private String vnotebody;
+
+ /**
+ * 鎶ヤ环鎹㈢畻鐜�
+ */
+ private String vqtunitrate;
+
+ /**
+ * 杩涘彛鍚堝悓鍙�
+ */
+ private String vitcontractbillcode;
/**
* 閫�搴撶悊鐢�
@@ -289,9 +1147,517 @@
private String vreturnreason;
/**
- * 鍑哄叆搴撶被鍨嬬紪鐮�
+ * 搴忓垪鍙�
*/
- private String vtrantypecode;
+ private String vserialcode;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�1
+ */
+ private String vsndef1;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�2
+ */
+ private String vsndef2;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�3
+ */
+ private String vsndef3;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�4
+ */
+ private String vsndef4;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�5
+ */
+ private String vsndef5;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�6
+ */
+ private String vsndef6;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�7
+ */
+ private String vsndef7;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�8
+ */
+ private String vsndef8;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�9
+ */
+ private String vsndef9;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�10
+ */
+ private String vsndef10;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�11
+ */
+ private String vsndef11;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�12
+ */
+ private String vsndef12;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�13
+ */
+ private String vsndef13;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�14
+ */
+ private String vsndef14;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�15
+ */
+ private String vsndef15;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�16
+ */
+ private String vsndef16;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�17
+ */
+ private String vsndef17;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�18
+ */
+ private String vsndef18;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�19
+ */
+ private String vsndef19;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�20
+ */
+ private String vsndef20;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�21
+ */
+ private String vsndef21;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�22
+ */
+ private String vsndef22;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�23
+ */
+ private String vsndef23;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�24
+ */
+ private String vsndef24;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�25
+ */
+ private String vsndef25;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�26
+ */
+ private String vsndef26;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�27
+ */
+ private String vsndef27;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�28
+ */
+ private String vsndef28;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�29
+ */
+ private String vsndef29;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�30
+ */
+ private String vsndef30;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�31
+ */
+ private String vsndef31;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�32
+ */
+ private String vsndef32;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�33
+ */
+ private String vsndef33;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�34
+ */
+ private String vsndef34;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�35
+ */
+ private String vsndef35;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�36
+ */
+ private String vsndef36;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�37
+ */
+ private String vsndef37;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�38
+ */
+ private String vsndef38;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�39
+ */
+ private String vsndef39;
+
+ /**
+ * 搴忓垪鍙疯嚜瀹氫箟椤�40
+ */
+ private String vsndef40;
+
+ /**
+ * 鏉ユ簮鍗曟嵁鍙�
+ */
+ private String vsourcebillcode;
+
+ /**
+ * 鏉ユ簮鍗曟嵁琛屽彿
+ */
+ private String vsourcerowno;
+
+ /**
+ * 鍏朵粬鏉ユ簮鍗曟嵁鍙�
+ */
+ private String vsrc2billcode;
+
+ /**
+ * 鍏朵粬鏉ユ簮鍗曡鍙�
+ */
+ private String vsrc2billrowno;
+
+ /**
+ * 渚涘簲鍟嗘壒娆″彿
+ */
+ private String vvendbatchcode;
+
+
+// /**
+// * 搴撳瓨缁勭粐鏈�鏂扮増鏈紙蹇呭～锛�
+// */
+// 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/resources/com/zy/nc/mapper/NccSaleDbddWmsMapper.xml b/src/main/resources/com/zy/nc/mapper/NccSaleDbddWmsMapper.xml
new file mode 100644
index 0000000..ffd0ec9
--- /dev/null
+++ b/src/main/resources/com/zy/nc/mapper/NccSaleDbddWmsMapper.xml
@@ -0,0 +1,59 @@
+<?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="com.zy.nc.mapper.NccSaleDbddWmsMapper">
+
+ <resultMap id="BaseResultMap" type="com.zy.nc.entity.NccSaleDbddWms">
+ <id property="cbillid" column="CBILLID" />
+ <result property="vbillcode" column="VBILLCODE" />
+ <result property="dbilldate" column="DBILLDATE" />
+ <result property="taudittime" column="TAUDITTIME" />
+ <result property="drkczzbm" column="DRKCZZBM" />
+ <result property="drkczzmc" column="DRKCZZMC" />
+ <result property="dckczzbm" column="DCKCZZBM" />
+ <result property="dckczzmc" column="DCKCZZMC" />
+ <result property="dcbmbm" column="DCBMBM" />
+ <result property="dcbmmc" column="DCBMMC" />
+ <result property="drbmbm" column="DRBMBM" />
+ <result property="drbmmc" column="DRBMMC" />
+ <result property="drckbm" column="DRCKBM" />
+ <result property="drckmc" column="DRCKMC" />
+ <result property="dcckbm" column="DCCKBM" />
+ <result property="dcckmc" column="DCCKMC" />
+ <result property="zdw" column="ZDW" />
+ <result property="zsl" column="ZSL" />
+ <result property="fdw" column="FDW" />
+ <result property="fsl" column="FSL" />
+ <result property="yfwfzsl" column="YFWFZSL" />
+ <result property="fstatusflag" column="FSTATUSFLAG" />
+ <result property="frowstatuflag" column="FROWSTATUFLAG" />
+ <result property="boutendflag" column="BOUTENDFLAG" />
+ <result property="bsendendflag" column="BSENDENDFLAG" />
+ <result property="blatestflag" column="BLATESTFLAG" />
+ <result property="vnote" column="VNOTE" />
+ <result property="fioonwayownerflag" column="FIOONWAYOWNERFLAG" />
+ <result property="fotonwayownerflag" column="FOTONWAYOWNERFLAG" />
+ <result property="conwayownerorgid" column="CONWAYOWNERORGID" />
+ <result property="biosettleendflag" column="BIOSETTLEENDFLAG" />
+ <result property="noutnum" column="NOUTNUM" />
+ <result property="ninnum" column="NINNUM" />
+ <result property="ts" column="TS" />
+ <result property="dr" column="DR" />
+ <result property="wmsMemo" column="wms_memo" />
+ <result property="wmsFlag" column="wms_flag" />
+ <result property="wlbm" column="WLBM" />
+ <result property="vbatchcode" column="VBATCHCODE" />
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ CBILLID,VBILLCODE,DBILLDATE,TAUDITTIME,DRKCZZBM,DRKCZZMC,
+ DCKCZZBM,DCKCZZMC,DCBMBM,DCBMMC,DRBMBM,
+ DRBMMC,DRCKBM,DRCKMC,DCCKBM,DCCKMC,
+ ZDW,ZSL,FDW,FSL,YFWFZSL,
+ FSTATUSFLAG,FROWSTATUFLAG,BOUTENDFLAG,BSENDENDFLAG,BLATESTFLAG,
+ VNOTE,FIOONWAYOWNERFLAG,FOTONWAYOWNERFLAG,CONWAYOWNERORGID,BIOSETTLEENDFLAG,
+ NOUTNUM,NINNUM,TS,DR,wms_memo,
+ wms_flag,WLBM,VBATCHCODE
+ </sql>
+</mapper>
diff --git a/src/main/resources/mapper/nc/NccSaleDbddWmsMapper.xml b/src/main/resources/mapper/nc/NccSaleDbddWmsMapper.xml
new file mode 100644
index 0000000..9349a0e
--- /dev/null
+++ b/src/main/resources/mapper/nc/NccSaleDbddWmsMapper.xml
@@ -0,0 +1,65 @@
+<?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="com.zy.nc.mapper.NccSaleDbddWmsMapper">
+
+ <resultMap id="BaseResultMap" type="com.zy.nc.entity.NccSaleDbddWms">
+ <id property="cbillid" column="CBILLID" />
+ <result property="vbillcode" column="VBILLCODE" />
+ <result property="dbilldate" column="DBILLDATE" />
+ <result property="taudittime" column="TAUDITTIME" />
+ <result property="drkczzbm" column="DRKCZZBM" />
+ <result property="drkczzmc" column="DRKCZZMC" />
+ <result property="dckczzbm" column="DCKCZZBM" />
+ <result property="dckczzmc" column="DCKCZZMC" />
+ <result property="dcbmbm" column="DCBMBM" />
+ <result property="dcbmmc" column="DCBMMC" />
+ <result property="drbmbm" column="DRBMBM" />
+ <result property="drbmmc" column="DRBMMC" />
+ <result property="drckbm" column="DRCKBM" />
+ <result property="drckmc" column="DRCKMC" />
+ <result property="dcckbm" column="DCCKBM" />
+ <result property="dcckmc" column="DCCKMC" />
+ <result property="zdw" column="ZDW" />
+ <result property="zsl" column="ZSL" />
+ <result property="fdw" column="FDW" />
+ <result property="fsl" column="FSL" />
+ <result property="yfwfzsl" column="YFWFZSL" />
+ <result property="fstatusflag" column="FSTATUSFLAG" />
+ <result property="frowstatuflag" column="FROWSTATUFLAG" />
+ <result property="boutendflag" column="BOUTENDFLAG" />
+ <result property="bsendendflag" column="BSENDENDFLAG" />
+ <result property="blatestflag" column="BLATESTFLAG" />
+ <result property="vnote" column="VNOTE" />
+ <result property="fioonwayownerflag" column="FIOONWAYOWNERFLAG" />
+ <result property="fotonwayownerflag" column="FOTONWAYOWNERFLAG" />
+ <result property="conwayownerorgid" column="CONWAYOWNERORGID" />
+ <result property="biosettleendflag" column="BIOSETTLEENDFLAG" />
+ <result property="noutnum" column="NOUTNUM" />
+ <result property="ninnum" column="NINNUM" />
+ <result property="ts" column="TS" />
+ <result property="dr" column="DR" />
+ <result property="wmsMemo" column="wms_memo" />
+ <result property="wmsFlag" column="wms_flag" />
+ <result property="wlbm" column="WLBM" />
+ <result property="vbatchcode" column="VBATCHCODE" />
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ CBILLID,VBILLCODE,DBILLDATE,TAUDITTIME,DRKCZZBM,DRKCZZMC,
+ DCKCZZBM,DCKCZZMC,DCBMBM,DCBMMC,DRBMBM,
+ DRBMMC,DRCKBM,DRCKMC,DCCKBM,DCCKMC,
+ ZDW,ZSL,FDW,FSL,YFWFZSL,
+ FSTATUSFLAG,FROWSTATUFLAG,BOUTENDFLAG,BSENDENDFLAG,BLATESTFLAG,
+ VNOTE,FIOONWAYOWNERFLAG,FOTONWAYOWNERFLAG,CONWAYOWNERORGID,BIOSETTLEENDFLAG,
+ NOUTNUM,NINNUM,TS,DR,wms_memo,
+ wms_flag,WLBM,VBATCHCODE
+ </sql>
+
+ <select id="selectDbdd" resultType="java.lang.String">
+ select distinct VBILLCODE
+ from ncc_sale_dbdd_wms
+ where wms_flag != 1 and FSTATUSFLAG = 4 and FROWSTATUFLAG = 4 limit 100
+ </select>
+</mapper>
diff --git a/src/main/resources/mapper/nc/NccScZkmxbWmsMapper.xml b/src/main/resources/mapper/nc/NccScZkmxbWmsMapper.xml
index a2f3e42..3bce543 100644
--- a/src/main/resources/mapper/nc/NccScZkmxbWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccScZkmxbWmsMapper.xml
@@ -78,7 +78,7 @@
<select id="selectZk" resultType="java.lang.String">
select distinct VBILLCODE
- from ncc_sale_xsfhmx_wms
- where wms_flag != 1 and fstatusflag = 2 limit 100
+ from ncc_sc_zkmxb_wms
+ where wms_flag != 1 and DJZT = 4 limit 100
</select>
</mapper>
--
Gitblit v1.9.1