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("生成单据明细失败，请联系管理员"); } 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); } 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) { } } } } src/main/java/com/zy/nc/entity/NccSaleDbddWms.java
New file @@ -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(); } } src/main/java/com/zy/nc/mapper/NccSaleDbddWmsMapper.java
New file @@ -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 针对表【ncc_sale_dbdd_wms】的数据库操作Mapper * @createDate 2025-05-21 16:04:17 * @Entity com.zy.nc.entity.NccSaleDbddWms */ public interface NccSaleDbddWmsMapper extends BaseMapper<NccSaleDbddWms> { List<String> selectDbdd(); }
New file @@ -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 针对表【ncc_sale_dbdd_wms】的数据库操作Service * @createDate 2025-05-21 16:04:17 */ public interface NccSaleDbddWmsService extends IService<NccSaleDbddWms> { List<String> selectDbdd(); } src/main/java/com/zy/nc/service/impl/NccSaleDbddWmsServiceImpl.java
New file @@ -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 针对表【ncc_sale_dbdd_wms】的数据库操作Service实现 * @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(); } }
@@ -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) { 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; } } 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; /** * 收货利润中心（VID） */ private String cioliabilityvid; /** * 结算利润中心 */ private String cliabilityoid; /** * 结算利润中心（VID） */ 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; // // /** // * 收货利润中心（VID） // */ // 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; // 表头自定义项（vdef1 - 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; // // // 表头自定义项（vdef1 - 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; } src/main/resources/com/zy/nc/mapper/NccSaleDbddWmsMapper.xml
New file @@ -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> src/main/resources/mapper/nc/NccSaleDbddWmsMapper.xml
New file @@ -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> 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>
