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) { 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) { src/main/java/com/zy/nc/entity/NccCkPddWms.java
@@ -165,6 +165,11 @@ private Integer wmsFlag; /** * */ private String wmsMemo; /** * */ private Integer hdr; 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) { 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) { 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) { 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) { 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) { 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) { 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) { src/main/java/com/zy/nc/entity/NccSaleDbckmxb.java
File was deleted 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(); } src/main/java/com/zy/nc/entity/NccSaleXsckmx.java
File was deleted 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) { 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) { 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) { src/main/java/com/zy/nc/mapper/NccSaleDbckmxbMapper.java
File was deleted src/main/java/com/zy/nc/mapper/NccSaleXsckmxMapper.java
File was deleted 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; 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"> 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"> 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"> 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"> 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"> 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"> 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"> 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"> 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"> 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"> src/main/resources/mapper/nc/NccSaleDbckmxbMapper.xml
File was deleted src/main/resources/mapper/nc/NccSaleXclGgsybWmsMapper.xml
New file @@ -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> src/main/resources/mapper/nc/NccSaleXsckmxMapper.xml
File was deleted 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"> 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"> 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">
