From 244f41d475c3d5fbc2cf7c006aeab7582e76fdce Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 17 五月 2025 10:06:57 +0800
Subject: [PATCH] 接口编写

---
 src/main/java/com/zy/nc/entity/NccCkPddWms.java                  |    5 +
 src/main/resources/mapper/nc/NccCgCgdhdWmsMapper.xml             |    1 
 src/main/resources/mapper/nc/NccCkPddWmsMapper.xml               |    1 
 src/main/resources/mapper/nc/VGetBdMaterialMapper.xml            |    1 
 src/main/java/com/zy/nc/entity/NccJcCkhw.java                    |    5 
 src/main/java/com/zy/nc/entity/NccJcRyWms.java                   |    4 
 src/main/resources/mapper/nc/NccOrgCorpWmsMapper.xml             |    1 
 src/main/java/com/zy/nc/entity/NccScZkmxbWms.java                |  120 ++++++++++++-----------
 src/main/java/com/zy/nc/entity/NccCgCgdhdWms.java                |    5 
 src/main/java/com/zy/nc/entity/NccJcCkWms.java                   |    4 
 src/main/java/com/zy/nc/entity/NccSaleXclGgsybWms.java           |   18 +++
 src/main/resources/mapper/nc/NccScZkmxbWmsMapper.xml             |    1 
 src/main/resources/mapper/nc/NccJcCkhwMapper.xml                 |    1 
 src/main/resources/mapper/nc/NccJcWlflWmsMapper.xml              |    1 
 src/main/resources/mapper/nc/NccSaleXclGgsybWmsMapper.xml        |   11 ++
 src/main/resources/mapper/nc/NccJcQilibcBarcodeflowWmsMapper.xml |    1 
 src/main/resources/mapper/nc/NccSaleXsfhmxWmsMapper.xml          |    1 
 src/main/java/com/zy/nc/entity/NccJcWlflWms.java                 |    4 
 src/main/java/com/zy/nc/entity/NccSaleXsfhmxWms.java             |    5 
 src/main/resources/mapper/nc/NccJcBmWmsMapper.xml                |    1 
 src/main/java/com/zy/nc/entity/NccJcQilibcBarcodeflowWms.java    |    4 
 src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java       |   40 ++++++--
 src/main/java/com/zy/nc/entity/NccJcBmWms.java                   |    5 
 src/main/java/com/zy/nc/entity/NccBdCustomerWms.java             |    5 
 /dev/null                                                        |   12 --
 src/main/resources/mapper/nc/NccJcCkWmsMapper.xml                |    1 
 src/main/java/com/zy/nc/entity/NccOrgCorpWms.java                |    4 
 src/main/java/com/zy/nc/entity/VGetBdMaterial.java               |    5 
 src/main/resources/mapper/nc/NccBdCustomerWmsMapper.xml          |    1 
 src/main/resources/mapper/nc/NccJcRyWmsMapper.xml                |    1 
 30 files changed, 182 insertions(+), 87 deletions(-)

diff --git a/src/main/java/com/zy/nc/entity/NccBdCustomerWms.java b/src/main/java/com/zy/nc/entity/NccBdCustomerWms.java
index 7eeca27..c259fa6 100644
--- a/src/main/java/com/zy/nc/entity/NccBdCustomerWms.java
+++ b/src/main/java/com/zy/nc/entity/NccBdCustomerWms.java
@@ -63,7 +63,10 @@
      * 
      */
     private Integer wmsFlag;
-
+    /**
+     *
+     */
+    private String wmsMemo;
     @Override
     public boolean equals(Object that) {
         if (this == that) {
diff --git a/src/main/java/com/zy/nc/entity/NccCgCgdhdWms.java b/src/main/java/com/zy/nc/entity/NccCgCgdhdWms.java
index 82177ce..f2b4c7c 100644
--- a/src/main/java/com/zy/nc/entity/NccCgCgdhdWms.java
+++ b/src/main/java/com/zy/nc/entity/NccCgCgdhdWms.java
@@ -178,7 +178,10 @@
      * 
      */
     private Integer bdr;
-
+    /**
+     *
+     */
+    private String wmsMemo;
     @Override
     public boolean equals(Object that) {
         if (this == that) {
diff --git a/src/main/java/com/zy/nc/entity/NccCkPddWms.java b/src/main/java/com/zy/nc/entity/NccCkPddWms.java
index 42b81e2..8facf0c 100644
--- a/src/main/java/com/zy/nc/entity/NccCkPddWms.java
+++ b/src/main/java/com/zy/nc/entity/NccCkPddWms.java
@@ -165,6 +165,11 @@
     private Integer wmsFlag;
 
     /**
+     *
+     */
+    private String wmsMemo;
+
+    /**
      * 
      */
     private Integer hdr;
diff --git a/src/main/java/com/zy/nc/entity/NccJcBmWms.java b/src/main/java/com/zy/nc/entity/NccJcBmWms.java
index 588e736..749a090 100644
--- a/src/main/java/com/zy/nc/entity/NccJcBmWms.java
+++ b/src/main/java/com/zy/nc/entity/NccJcBmWms.java
@@ -66,7 +66,10 @@
      * 
      */
     private Integer wmsFlag;
-
+    /**
+     *
+     */
+    private String wmsMemo;
     @Override
     public boolean equals(Object that) {
         if (this == that) {
diff --git a/src/main/java/com/zy/nc/entity/NccJcCkWms.java b/src/main/java/com/zy/nc/entity/NccJcCkWms.java
index 9acbf9b..f5b332d 100644
--- a/src/main/java/com/zy/nc/entity/NccJcCkWms.java
+++ b/src/main/java/com/zy/nc/entity/NccJcCkWms.java
@@ -237,6 +237,10 @@
      * 
      */
     private Integer wmsFlag;
+    /**
+     *
+     */
+    private String wmsMemo;
 
     @Override
     public boolean equals(Object that) {
diff --git a/src/main/java/com/zy/nc/entity/NccJcCkhw.java b/src/main/java/com/zy/nc/entity/NccJcCkhw.java
index 90b7ee3..62d6041 100644
--- a/src/main/java/com/zy/nc/entity/NccJcCkhw.java
+++ b/src/main/java/com/zy/nc/entity/NccJcCkhw.java
@@ -47,7 +47,10 @@
      * 
      */
     private Integer wmsFlag;
-
+    /**
+     *
+     */
+    private String wmsMemo;
     @Override
     public boolean equals(Object that) {
         if (this == that) {
diff --git a/src/main/java/com/zy/nc/entity/NccJcQilibcBarcodeflowWms.java b/src/main/java/com/zy/nc/entity/NccJcQilibcBarcodeflowWms.java
index ce6e401..4732e19 100644
--- a/src/main/java/com/zy/nc/entity/NccJcQilibcBarcodeflowWms.java
+++ b/src/main/java/com/zy/nc/entity/NccJcQilibcBarcodeflowWms.java
@@ -68,6 +68,10 @@
      * 
      */
     private Integer wmsFlag;
+    /**
+     *
+     */
+    private String wmsMemo;
 
     @Override
     public boolean equals(Object that) {
diff --git a/src/main/java/com/zy/nc/entity/NccJcRyWms.java b/src/main/java/com/zy/nc/entity/NccJcRyWms.java
index cd7f283..dbe5e25 100644
--- a/src/main/java/com/zy/nc/entity/NccJcRyWms.java
+++ b/src/main/java/com/zy/nc/entity/NccJcRyWms.java
@@ -71,6 +71,10 @@
      * 
      */
     private Integer wmsFlag;
+    /**
+     *
+     */
+    private String wmsMemo;
 
     @Override
     public boolean equals(Object that) {
diff --git a/src/main/java/com/zy/nc/entity/NccJcWlflWms.java b/src/main/java/com/zy/nc/entity/NccJcWlflWms.java
index 79c9a1e..b81a4e5 100644
--- a/src/main/java/com/zy/nc/entity/NccJcWlflWms.java
+++ b/src/main/java/com/zy/nc/entity/NccJcWlflWms.java
@@ -52,6 +52,10 @@
      * 
      */
     private Integer wmsFlag;
+    /**
+     *
+     */
+    private String wmsMemo;
 
     @Override
     public boolean equals(Object that) {
diff --git a/src/main/java/com/zy/nc/entity/NccOrgCorpWms.java b/src/main/java/com/zy/nc/entity/NccOrgCorpWms.java
index 4ea5442..871aa55 100644
--- a/src/main/java/com/zy/nc/entity/NccOrgCorpWms.java
+++ b/src/main/java/com/zy/nc/entity/NccOrgCorpWms.java
@@ -31,6 +31,10 @@
      * 
      */
     private Integer wmsFlag;
+    /**
+     *
+     */
+    private String wmsMemo;
 
     @Override
     public boolean equals(Object that) {
diff --git a/src/main/java/com/zy/nc/entity/NccSaleDbckmxb.java b/src/main/java/com/zy/nc/entity/NccSaleDbckmxb.java
deleted file mode 100644
index bc0a53c..0000000
--- a/src/main/java/com/zy/nc/entity/NccSaleDbckmxb.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.zy.nc.entity;
-
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-@Data
-@TableName("ncc_sale_dbckmxb")
-public class NccSaleDbckmxb implements Serializable {
-    @TableId
-    private String cgeneralhid;
-
-    private String vbillcode;
-
-    private String billtypename;
-
-    private String dbilldate;
-
-    private String cgeneralbid;
-
-    private String zzbm;
-
-    private String zzmc;
-
-    private BigDecimal dblx;
-
-    private String ckbm;
-
-    private String ckmc;
-
-    private String drzzbm;
-
-    private String drzzmc;
-
-    private String drckbm;
-
-    private String drckmc;
-
-    private BigDecimal djzt;
-
-    private String kczt;
-
-    private String wlbm;
-
-    private String wlmc;
-
-    private String zt;
-
-    private String ccorrespondcode;
-
-    private String zdw;
-
-    private String fdw;
-
-    private String bmbm;
-
-    private String bmmc;
-
-    private String khbm;
-
-    private String khmc;
-
-    private String khjc;
-
-    private BigDecimal yfsl;
-
-    private BigDecimal yfzsl;
-
-    private BigDecimal sfzsl;
-
-    private BigDecimal sffsl;
-
-    private BigDecimal je;
-
-    private String ts;
-
-    private BigDecimal dr;
-
-    private String btranendflag;
-
-    private String csumid;
-
-    private BigDecimal naccumoutbacknum;
-
-    private BigDecimal naccumoutsignnum;
-
-    private BigDecimal naccumvminum;
-
-    private BigDecimal naccumwastnum;
-
-    private BigDecimal ncorrespondastnum;
-
-    private BigDecimal ncorrespondgrsnum;
-
-    private BigDecimal ncorrespondnum;
-
-    private BigDecimal ntotaltrannum;
-
-    private BigDecimal ntranoutastnum;
-
-    private BigDecimal ntranoutnum;
-
-
-
-}
diff --git a/src/main/java/com/zy/nc/entity/NccSaleXclGgsybWms.java b/src/main/java/com/zy/nc/entity/NccSaleXclGgsybWms.java
index c059d67..678a8aa 100644
--- a/src/main/java/com/zy/nc/entity/NccSaleXclGgsybWms.java
+++ b/src/main/java/com/zy/nc/entity/NccSaleXclGgsybWms.java
@@ -173,6 +173,16 @@
      */
     private String clcj;
 
+    /**
+     * 
+     */
+    private String wmsMemo;
+
+    /**
+     * 
+     */
+    private Integer wmsFlag;
+
     @Override
     public boolean equals(Object that) {
         if (this == that) {
@@ -216,7 +226,9 @@
             && (this.getSjflmc() == null ? other.getSjflmc() == null : this.getSjflmc().equals(other.getSjflmc()))
             && (this.getZsl() == null ? other.getZsl() == null : this.getZsl().equals(other.getZsl()))
             && (this.getFsl() == null ? other.getFsl() == null : this.getFsl().equals(other.getFsl()))
-            && (this.getClcj() == null ? other.getClcj() == null : this.getClcj().equals(other.getClcj()));
+            && (this.getClcj() == null ? other.getClcj() == null : this.getClcj().equals(other.getClcj()))
+            && (this.getWmsMemo() == null ? other.getWmsMemo() == null : this.getWmsMemo().equals(other.getWmsMemo()))
+            && (this.getWmsFlag() == null ? other.getWmsFlag() == null : this.getWmsFlag().equals(other.getWmsFlag()));
     }
 
     @Override
@@ -255,6 +267,8 @@
         result = prime * result + ((getZsl() == null) ? 0 : getZsl().hashCode());
         result = prime * result + ((getFsl() == null) ? 0 : getFsl().hashCode());
         result = prime * result + ((getClcj() == null) ? 0 : getClcj().hashCode());
+        result = prime * result + ((getWmsMemo() == null) ? 0 : getWmsMemo().hashCode());
+        result = prime * result + ((getWmsFlag() == null) ? 0 : getWmsFlag().hashCode());
         return result;
     }
 
@@ -296,6 +310,8 @@
         sb.append(", zsl=").append(zsl);
         sb.append(", fsl=").append(fsl);
         sb.append(", clcj=").append(clcj);
+        sb.append(", wmsMemo=").append(wmsMemo);
+        sb.append(", wmsFlag=").append(wmsFlag);
         sb.append("]");
         return sb.toString();
     }
diff --git a/src/main/java/com/zy/nc/entity/NccSaleXsckmx.java b/src/main/java/com/zy/nc/entity/NccSaleXsckmx.java
deleted file mode 100644
index c97b64a..0000000
--- a/src/main/java/com/zy/nc/entity/NccSaleXsckmx.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package com.zy.nc.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-@Data
-@TableName("ncc_sale_xsckmx")
-public class NccSaleXsckmx implements Serializable {
-
-    @TableId(value = "cgeneralbid", type = IdType.INPUT)
-    @TableField("cgeneralbid")
-    private String cgeneralbid;
-
-    private String cszzbm;
-
-    private String xxzzmc;
-
-    private String xsbmbm;
-
-    private String xsbmmc;
-
-    private String billcode;
-
-    private String hts;
-
-    private String billdate;
-
-    private BigDecimal hdr;
-
-    private String approdate;
-
-    private String saler;
-
-    private String djlx;
-
-    private String storname;
-
-    private String storcode;
-
-    private String sssyb;
-
-    private String custcode;
-
-    private String custname;
-
-    private String maker;
-
-    private String approver;
-
-    private String taudittime;
-
-    private String status;
-
-    private String crowno;
-
-    private BigDecimal bdr;
-
-    private String bts;
-
-    private String mlbm;
-
-    private String mlmc;
-
-    private String wlu8name;
-
-    private String mlgg;
-
-    private String mlxh;
-
-    private String mlflbm;
-
-    private String mlflmc;
-
-    private String zsjflbm;
-
-    private String zsjflmc;
-
-    private String mlzdw;
-
-    private String mlfdw;
-
-    private BigDecimal sffsl;
-
-    private BigDecimal sfzsl;
-
-    private BigDecimal norigtaxnetprice;
-
-    private BigDecimal ntaxprice;
-
-    private BigDecimal norigprice;
-
-    private BigDecimal nprice;
-
-    private BigDecimal ntaxmny;
-
-    private BigDecimal nmny;
-
-    private BigDecimal ntax;
-
-    private String vbatchcode;
-
-    private String jt1;
-
-    private String jt2;
-
-    private String jt3;
-
-    private String gx;
-
-    private String clcj;
-
-    private String ytdjh;
-
-    private String lydjh;
-
-    private String xsqy;
-
-    private String xsflbm;
-
-    private String xsflmc;
-
-    private String ckbm;
-
-    private String ckmc;
-
-    private String sjflbm;
-
-    private String sjflmc;
-
-
-}
diff --git a/src/main/java/com/zy/nc/entity/NccSaleXsfhmxWms.java b/src/main/java/com/zy/nc/entity/NccSaleXsfhmxWms.java
index 1354f4f..2f08159 100644
--- a/src/main/java/com/zy/nc/entity/NccSaleXsfhmxWms.java
+++ b/src/main/java/com/zy/nc/entity/NccSaleXsfhmxWms.java
@@ -418,7 +418,10 @@
      * 
      */
     private String vdef4;
-
+    /**
+     *
+     */
+    private String wmsMemo;
     @Override
     public boolean equals(Object that) {
         if (this == that) {
diff --git a/src/main/java/com/zy/nc/entity/NccScZkmxbWms.java b/src/main/java/com/zy/nc/entity/NccScZkmxbWms.java
index 3576644..a1f53bd 100644
--- a/src/main/java/com/zy/nc/entity/NccScZkmxbWms.java
+++ b/src/main/java/com/zy/nc/entity/NccScZkmxbWms.java
@@ -15,295 +15,299 @@
 @Data
 public class NccScZkmxbWms {
     /**
-     * 
+     *
      */
     @TableId
     private String cspecialbid;
 
     /**
-     * 
+     *
      */
     private String vbillcode;
 
     /**
-     * 
+     *
      */
     private String dmakedate;
 
     /**
-     * 
+     *
      */
     private Date scdmakedate;
 
     /**
-     * 
+     *
      */
     private String dbilldate;
 
     /**
-     * 
+     *
      */
     private String taudittime;
 
     /**
-     * 
+     *
      */
     private String zzbm;
 
     /**
-     * 
+     *
      */
     private String zzmc;
 
     /**
-     * 
+     *
      */
     private String ckzzbm;
 
     /**
-     * 
+     *
      */
     private String ckzzmc;
 
     /**
-     * 
+     *
      */
     private String ckssbcode;
 
     /**
-     * 
+     *
      */
     private String cksssyb;
 
     /**
-     * 
+     *
      */
     private String ckckbm;
 
     /**
-     * 
+     *
      */
     private String ckckmc;
 
     /**
-     * 
+     *
      */
     private String ckbmbm;
 
     /**
-     * 
+     *
      */
     private String ckbmmc;
 
     /**
-     * 
+     *
      */
     private String rkzzbm;
 
     /**
-     * 
+     *
      */
     private String rkzzmc;
 
     /**
-     * 
+     *
      */
     private String rkssbcode;
 
     /**
-     * 
+     *
      */
     private String rksssyb;
 
     /**
-     * 
+     *
      */
     private String rkckbm;
 
     /**
-     * 
+     *
      */
     private String rkckmc;
 
     /**
-     * 
+     *
      */
     private String rkbmbm;
 
     /**
-     * 
+     *
      */
     private String rkbmmc;
 
     /**
-     * 
+     *
      */
     private Long djzt;
 
     /**
-     * 
+     *
      */
     private String zklx;
 
     /**
-     * 
+     *
      */
     private String wlbm;
 
     /**
-     * 
+     *
      */
     private String wlmc;
 
     /**
-     * 
+     *
      */
     private String wlgg;
 
     /**
-     * 
+     *
      */
     private String wlxh;
 
     /**
-     * 
+     *
      */
     private String wljc;
 
     /**
-     * 
+     *
      */
     private String jbflbm;
 
     /**
-     * 
+     *
      */
     private String jbflmc;
 
     /**
-     * 
+     *
      */
     private String sjflbm;
 
     /**
-     * 
+     *
      */
     private String sjflmc;
 
     /**
-     * 
+     *
      */
     private String zsjflbm;
 
     /**
-     * 
+     *
      */
     private String zsjflmc;
 
     /**
-     * 
+     *
      */
     private String zdw;
 
     /**
-     * 
+     *
      */
     private String fdw;
 
     /**
-     * 
+     *
      */
     private String kczt;
 
     /**
-     * 
+     *
      */
     private String vbatchcode;
 
     /**
-     * 
+     *
      */
     private String vdef1;
 
     /**
-     * 
+     *
      */
     private String vdef2;
 
     /**
-     * 
+     *
      */
     private String vdef3;
 
     /**
-     * 
+     *
      */
     private String khbm;
 
     /**
-     * 
+     *
      */
     private String khmc;
 
     /**
-     * 
+     *
      */
     private String khjc;
 
     /**
-     * 
+     *
      */
     private BigDecimal yzzsl;
 
     /**
-     * 
+     *
      */
     private BigDecimal yzfsl;
 
     /**
-     * 
+     *
      */
     private BigDecimal ljckzsl;
 
     /**
-     * 
+     *
      */
     private BigDecimal ljrkzsl;
 
     /**
-     * 
+     *
      */
     private Integer dr;
 
     /**
-     * 
+     *
      */
     private String ts;
 
     /**
-     * 
+     *
      */
     private Integer wmsFlag;
 
     /**
-     * 
+     *
      */
     private BigDecimal yingzsl;
 
     /**
-     * 
+     *
      */
     private BigDecimal yingzzsl;
 
     /**
-     * 
+     *
      */
     private Integer bdr;
 
     /**
-     * 
+     *
      */
     private String bts;
+    /**
+     *
+     */
+    private String wmsMemo;
 
     @Override
     public boolean equals(Object that) {
diff --git a/src/main/java/com/zy/nc/entity/VGetBdMaterial.java b/src/main/java/com/zy/nc/entity/VGetBdMaterial.java
index 5e92f06..ce3229c 100644
--- a/src/main/java/com/zy/nc/entity/VGetBdMaterial.java
+++ b/src/main/java/com/zy/nc/entity/VGetBdMaterial.java
@@ -228,7 +228,10 @@
      * 
      */
     private Integer wmsFlag;
-
+    /**
+     *
+     */
+    private String wmsMemo;
     @Override
     public boolean equals(Object that) {
         if (this == that) {
diff --git a/src/main/java/com/zy/nc/mapper/NccSaleDbckmxbMapper.java b/src/main/java/com/zy/nc/mapper/NccSaleDbckmxbMapper.java
deleted file mode 100644
index cfc1b12..0000000
--- a/src/main/java/com/zy/nc/mapper/NccSaleDbckmxbMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.nc.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.nc.entity.NccSaleDbckmxb;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface NccSaleDbckmxbMapper extends BaseMapper<NccSaleDbckmxb> {
-
-}
diff --git a/src/main/java/com/zy/nc/mapper/NccSaleXsckmxMapper.java b/src/main/java/com/zy/nc/mapper/NccSaleXsckmxMapper.java
deleted file mode 100644
index 6121ff9..0000000
--- a/src/main/java/com/zy/nc/mapper/NccSaleXsckmxMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.nc.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.nc.entity.NccSaleXsckmx;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface NccSaleXsckmxMapper extends BaseMapper<NccSaleXsckmx> {
-
-}
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 61405a5..202d21b 100644
--- a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
@@ -2,10 +2,16 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.core.exception.CoolException;
 import com.zy.asrs.entity.InventoryCheckOrder;
 import com.zy.asrs.entity.InventoryCheckOrderDetl;
+import com.zy.asrs.entity.Mat;
 import com.zy.asrs.entity.param.OpenOrderPakinParam;
 import com.zy.asrs.entity.param.OpenOrderPakoutParam;
+import com.zy.asrs.service.InventoryCheckOrderDetlService;
+import com.zy.asrs.service.InventoryCheckOrderService;
+import com.zy.asrs.service.MatService;
 import com.zy.asrs.service.OpenService;
 import com.zy.asrs.task.AbstractHandler;
 import com.zy.asrs.task.core.ReturnT;
@@ -42,7 +48,13 @@
     private NccCkPddWmsService nccCkPddWmsService;
 
     @Autowired
-    private Inv nccCkPddWmsService;
+    private InventoryCheckOrderDetlService inventoryCheckOrderDetlService;
+
+    @Autowired
+    private InventoryCheckOrderService inventoryCheckOrderService;
+
+    @Autowired
+    private MatService matService;
 
     @Autowired
     private OpenService openService;
@@ -133,8 +145,8 @@
             long i = 1;
             List<NccCgCgdhdWms> wmsFlag = nccCgCgdhdWmsService.selectList(new EntityWrapper<NccCgCgdhdWms>().eq("vbillcode", string).ne("wms_flag", 1));
             for (NccCgCgdhdWms nccScZkmxbWms : wmsFlag) {
-                log.info("NccScZkmxbWms鏁版嵁:{}", JSONObject.toJSON(nccScZkmxbWms));
-                if ( nccScZkmxbWms.getBdr() == 0 && nccScZkmxbWms.getHdr() == 0) {
+                log.info("NccCgCgdhdWms鏁版嵁:{}", JSONObject.toJSON(nccScZkmxbWms));
+                if (nccScZkmxbWms.getBdr() == 0 && nccScZkmxbWms.getHdr() == 0) {
                     detlDto = new DetlDto();
                     detlDto.setMatnr(nccScZkmxbWms.getWlbm());
                     detlDto.setAnfme(nccScZkmxbWms.getYdzsl().doubleValue());
@@ -162,25 +174,33 @@
         List<String> strings = nccCkPddWmsService.selectPdd();
         for (String string : strings) {
             InventoryCheckOrder param = new InventoryCheckOrder();
-            InventoryCheckOrderDetl checkOrderDetl;
-            List<InventoryCheckOrderDetl> checkOrderDetls = new ArrayList<>();
-            long i = 1;
+            InventoryCheckOrderDetl checkOrderDetl = null;
             List<NccCkPddWms> wmsFlag = nccCkPddWmsService.selectList(new EntityWrapper<NccCkPddWms>().eq("vbillcode", string).ne("wms_flag", 1));
             for (NccCkPddWms nccScZkmxbWms : wmsFlag) {
                 log.info("NccCkPddWms鏁版嵁:{}", JSONObject.toJSON(nccScZkmxbWms));
                 if (nccScZkmxbWms.getBdr() == 0 && nccScZkmxbWms.getHdr() == 0) {
+                    Mat mat = matService.selectByMatnr(nccScZkmxbWms.getWlbm());
+                    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()) {
+                        throw new CoolException(nccScZkmxbWms.getWlbm() + "鐩樼偣鍗曠殑");
+                    }
                     checkOrderDetl = new InventoryCheckOrderDetl();
                     checkOrderDetl.setMatnr(nccScZkmxbWms.getWlbm());
+                    checkOrderDetl.setMaktx(mat.getMatnr());
+                    checkOrderDetl.setOrderNo(nccScZkmxbWms.getVbillcode());
                     checkOrderDetl.setAnfme(nccScZkmxbWms.getZmzsl().doubleValue());
                     checkOrderDetl.setBatch(nccScZkmxbWms.getVbatchcode());
-                    checkOrderDetls.add(checkOrderDetl);
-                    i++;
+                    inventoryCheckOrderDetlService.insert(checkOrderDetl);
                 }
                 nccScZkmxbWms.setWmsFlag(1);
+
             }
             param.setOrderNo(string);
-            param.setOrderDetails(orderDetails);
-            openService.pakoutOrderCreate(param);
+            param.setStatus("1");
+            inventoryCheckOrderService.insert(param);
             nccCkPddWmsService.updateBatchById(wmsFlag);
         }
         return SUCCESS;
diff --git a/src/main/resources/mapper/nc/NccBdCustomerWmsMapper.xml b/src/main/resources/mapper/nc/NccBdCustomerWmsMapper.xml
index 36d3186..b49aa13 100644
--- a/src/main/resources/mapper/nc/NccBdCustomerWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccBdCustomerWmsMapper.xml
@@ -15,6 +15,7 @@
             <result property="legalbody" column="LEGALBODY" />
             <result property="nlimitmny" column="NLIMITMNY" />
             <result property="wmsFlag" column="wms_flag" />
+            <result property="wmsMemo" column="wms_memo" />
     </resultMap>
 
     <sql id="Base_Column_List">
diff --git a/src/main/resources/mapper/nc/NccCgCgdhdWmsMapper.xml b/src/main/resources/mapper/nc/NccCgCgdhdWmsMapper.xml
index df39e17..5fc900f 100644
--- a/src/main/resources/mapper/nc/NccCgCgdhdWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccCgCgdhdWmsMapper.xml
@@ -36,6 +36,7 @@
             <result property="hts" column="HTS" />
             <result property="bts" column="BTS" />
             <result property="wmsFlag" column="wms_flag" />
+        <result property="wmsMemo" column="wms_memo" />
     </resultMap>
 
     <sql id="Base_Column_List">
diff --git a/src/main/resources/mapper/nc/NccCkPddWmsMapper.xml b/src/main/resources/mapper/nc/NccCkPddWmsMapper.xml
index d3e6f6e..8efdaaf 100644
--- a/src/main/resources/mapper/nc/NccCkPddWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccCkPddWmsMapper.xml
@@ -35,6 +35,7 @@
             <result property="hts" column="HTS" />
             <result property="bts" column="BTS" />
             <result property="wmsFlag" column="wms_flag" />
+        <result property="wmsMemo" column="wms_memo" />
     </resultMap>
 
     <sql id="Base_Column_List">
diff --git a/src/main/resources/mapper/nc/NccJcBmWmsMapper.xml b/src/main/resources/mapper/nc/NccJcBmWmsMapper.xml
index 58da22f..55aa762 100644
--- a/src/main/resources/mapper/nc/NccJcBmWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccJcBmWmsMapper.xml
@@ -16,6 +16,7 @@
             <result property="sssyb" column="SSSYB" />
             <result property="qyzt" column="QYZT" />
             <result property="wmsFlag" column="wms_flag" />
+        <result property="wmsMemo" column="wms_memo" />
     </resultMap>
 
     <sql id="Base_Column_List">
diff --git a/src/main/resources/mapper/nc/NccJcCkWmsMapper.xml b/src/main/resources/mapper/nc/NccJcCkWmsMapper.xml
index fb67032..10b8ea7 100644
--- a/src/main/resources/mapper/nc/NccJcCkWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccJcCkWmsMapper.xml
@@ -50,6 +50,7 @@
             <result property="storaddr" column="STORADDR" />
             <result property="ts" column="TS" />
             <result property="wmsFlag" column="wms_flag" />
+        <result property="wmsMemo" column="wms_memo" />
     </resultMap>
 
     <sql id="Base_Column_List">
diff --git a/src/main/resources/mapper/nc/NccJcCkhwMapper.xml b/src/main/resources/mapper/nc/NccJcCkhwMapper.xml
index ebe0c9e..44f3acc 100644
--- a/src/main/resources/mapper/nc/NccJcCkhwMapper.xml
+++ b/src/main/resources/mapper/nc/NccJcCkhwMapper.xml
@@ -12,6 +12,7 @@
             <result property="hwbm" column="HWBM" />
             <result property="hwmc" column="HWMC" />
             <result property="wmsFlag" column="wms_flag" />
+        <result property="wmsMemo" column="wms_memo" />
     </resultMap>
 
     <sql id="Base_Column_List">
diff --git a/src/main/resources/mapper/nc/NccJcQilibcBarcodeflowWmsMapper.xml b/src/main/resources/mapper/nc/NccJcQilibcBarcodeflowWmsMapper.xml
index fb79aaa..b080cd1 100644
--- a/src/main/resources/mapper/nc/NccJcQilibcBarcodeflowWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccJcQilibcBarcodeflowWmsMapper.xml
@@ -16,6 +16,7 @@
             <result property="vbillno" column="VBILLNO" />
             <result property="nastnum" column="NASTNUM" />
             <result property="wmsFlag" column="wms_flag" />
+        <result property="wmsMemo" column="wms_memo" />
     </resultMap>
 
     <sql id="Base_Column_List">
diff --git a/src/main/resources/mapper/nc/NccJcRyWmsMapper.xml b/src/main/resources/mapper/nc/NccJcRyWmsMapper.xml
index 0432632..e533514 100644
--- a/src/main/resources/mapper/nc/NccJcRyWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccJcRyWmsMapper.xml
@@ -17,6 +17,7 @@
             <result property="ssbmmc" column="SSBMMC" />
             <result property="sssyb" column="SSSYB" />
             <result property="wmsFlag" column="wms_flag" />
+        <result property="wmsMemo" column="wms_memo" />
     </resultMap>
 
     <sql id="Base_Column_List">
diff --git a/src/main/resources/mapper/nc/NccJcWlflWmsMapper.xml b/src/main/resources/mapper/nc/NccJcWlflWmsMapper.xml
index 762f423..b471247 100644
--- a/src/main/resources/mapper/nc/NccJcWlflWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccJcWlflWmsMapper.xml
@@ -13,6 +13,7 @@
             <result property="wljbfl" column="WLJBFL" />
             <result property="code1" column="CODE1" />
             <result property="wmsFlag" column="wms_flag" />
+        <result property="wmsMemo" column="wms_memo" />
     </resultMap>
 
     <sql id="Base_Column_List">
diff --git a/src/main/resources/mapper/nc/NccOrgCorpWmsMapper.xml b/src/main/resources/mapper/nc/NccOrgCorpWmsMapper.xml
index 9a68217..789032f 100644
--- a/src/main/resources/mapper/nc/NccOrgCorpWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccOrgCorpWmsMapper.xml
@@ -9,6 +9,7 @@
             <result property="name" column="NAME" />
             <result property="shortname" column="SHORTNAME" />
             <result property="wmsFlag" column="wms_flag" />
+        <result property="wmsMemo" column="wms_memo" />
     </resultMap>
 
     <sql id="Base_Column_List">
diff --git a/src/main/resources/mapper/nc/NccSaleDbckmxbMapper.xml b/src/main/resources/mapper/nc/NccSaleDbckmxbMapper.xml
deleted file mode 100644
index de4a464..0000000
--- a/src/main/resources/mapper/nc/NccSaleDbckmxbMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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.NccSaleDbckmxbMapper">
-
-
-
-</mapper>
diff --git a/src/main/resources/mapper/nc/NccSaleXclGgsybWmsMapper.xml b/src/main/resources/mapper/nc/NccSaleXclGgsybWmsMapper.xml
new file mode 100644
index 0000000..a7101a0
--- /dev/null
+++ b/src/main/resources/mapper/nc/NccSaleXclGgsybWmsMapper.xml
@@ -0,0 +1,11 @@
+<?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.NccSaleXclGgsybWmsMapper">
+
+    
+
+
+   
+</mapper>
diff --git a/src/main/resources/mapper/nc/NccSaleXsckmxMapper.xml b/src/main/resources/mapper/nc/NccSaleXsckmxMapper.xml
deleted file mode 100644
index 7a40514..0000000
--- a/src/main/resources/mapper/nc/NccSaleXsckmxMapper.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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.NccSaleXsckmxMapper">
-
-    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
-    <resultMap id="BaseResultMap" type="com.zy.nc.entity.NccSaleXsckmx">
-        <id column="cgeneralbid" property="cgeneralbid" />
-
-
-    </resultMap>
-
-</mapper>
diff --git a/src/main/resources/mapper/nc/NccSaleXsfhmxWmsMapper.xml b/src/main/resources/mapper/nc/NccSaleXsfhmxWmsMapper.xml
index 25dcdee..5553823 100644
--- a/src/main/resources/mapper/nc/NccSaleXsfhmxWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccSaleXsfhmxWmsMapper.xml
@@ -79,6 +79,7 @@
             <result property="kczzmc" column="KCZZMC" />
             <result property="vnote" column="VNOTE" />
             <result property="wmsFlag" column="wms_flag" />
+        <result property="wmsMemo" column="wms_memo" />
     </resultMap>
 
     <sql id="Base_Column_List">
diff --git a/src/main/resources/mapper/nc/NccScZkmxbWmsMapper.xml b/src/main/resources/mapper/nc/NccScZkmxbWmsMapper.xml
index 939895f..a2f3e42 100644
--- a/src/main/resources/mapper/nc/NccScZkmxbWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccScZkmxbWmsMapper.xml
@@ -59,6 +59,7 @@
             <result property="dr" column="DR" />
             <result property="ts" column="TS" />
             <result property="wmsFlag" column="wms_flag" />
+        <result property="wmsMemo" column="wms_memo" />
     </resultMap>
 
     <sql id="Base_Column_List">
diff --git a/src/main/resources/mapper/nc/VGetBdMaterialMapper.xml b/src/main/resources/mapper/nc/VGetBdMaterialMapper.xml
index bdb15a8..95ad21c 100644
--- a/src/main/resources/mapper/nc/VGetBdMaterialMapper.xml
+++ b/src/main/resources/mapper/nc/VGetBdMaterialMapper.xml
@@ -48,6 +48,7 @@
             <result property="sjflbm" column="SJFLBM" />
             <result property="sjflmc" column="SJFLMC" />
             <result property="wmsFlag" column="wms_flag" />
+        <result property="wmsMemo" column="wms_memo" />
     </resultMap>
 
     <sql id="Base_Column_List">

--
Gitblit v1.9.1