| src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/nc/entity/NccJcQilibcBarcodeflowWms.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/nc/entity/NccScZkmxbWms.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/com/zy/nc/mapper/NccSaleDbddWmsMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1,24 +1,22 @@ package com.zy.asrs.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; import com.core.common.*; import com.core.common.BaseRes; import com.core.common.Cools; import com.core.common.R; import com.core.common.SnowflakeIdWorker; import com.core.exception.CoolException; import com.zy.asrs.entity.*; import com.zy.asrs.entity.param.*; import com.zy.asrs.mapper.LocMastMapper; import com.zy.asrs.mapper.ManLocDetlMapper; import com.zy.asrs.service.*; import com.zy.asrs.utils.MatUtils; import com.zy.asrs.utils.OrderInAndOutUtil; import com.zy.common.entity.Parameter; import com.zy.common.model.DetlDto; import com.zy.common.model.MesCombParam; import com.zy.common.model.enums.WorkNoType; import com.zy.common.service.CommonService; import com.zy.common.utils.HttpHandler; import com.zy.nc.entity.NccJcQilibcBarcodeflowWms; import com.zy.nc.service.NccJcQilibcBarcodeflowWmsService; import lombok.extern.slf4j.Slf4j; @@ -625,7 +623,9 @@ // TODO 不考虑代码效率，因为旧代码bug少 if (!Cools.isEmpty(elem.getVbarcode())){ NccJcQilibcBarcodeflowWms vbarcode1 = barcodeflowWmsService.selectOne(new EntityWrapper<NccJcQilibcBarcodeflowWms>().eq("vbarcode", elem.getVbarcode())); elem.setBatch(vbarcode1.getVbatchcode()); elem.setMatnr(vbarcode1.getWlbm()); elem.setAnfme(vbarcode1.getNastnum().doubleValue()); } // 订单明细数量校验 @@ -787,7 +787,9 @@ // 添加明细 for (WrkDetl wrkDetl : list) { if (wrkDetl.getAnfme() == 0.0D) { continue; } if (wrkDetl.getAnfme() == 0.0D) { continue; } // todo 盘点记录、保存调整记录 String orderNo = wrkDetl.getOrderNo(); Mat mat = matService.selectByMatnr(wrkDetl.getMatnr()); src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
@@ -14,6 +14,7 @@ import com.zy.nc.entity.NccCgCgdhdWms; import com.zy.nc.entity.NccSaleDbddWms; import com.zy.nc.entity.NccSaleXsfhmxWms; import com.zy.nc.entity.NccScZkmxbWms; import com.zy.nc.util.NcResultMessage; import com.zy.nc.vo.*; import lombok.extern.slf4j.Slf4j; @@ -188,9 +189,11 @@ generalInBodyVO = new GeneralInBodyVO(); String remark = orderDetl.getRemark(); if (!Cools.isEmpty(remark)) { NccSaleXsfhmxWms nccSaleXsfhmxWms = JSONObject.parseObject(remark, NccSaleXsfhmxWms.class); generalInBodyVO.setCsourcebillbid(nccSaleXsfhmxWms.getCdeliverybid()); generalInBodyVO.setCsourcebillhid(nccSaleXsfhmxWms.getCdeliveryid()); NccScZkmxbWms nccScZkmxbWms = JSONObject.parseObject(remark, NccScZkmxbWms.class); generalInBodyVO.setCsourcebillbid(nccScZkmxbWms.getCspecialbid()); //generalInBodyVO.setCsourcebillhid(nccScZkmxbWms.getCdeliveryid()); //generalInBodyVO.setCmaterialvid(orderDetl.getMatnr()); generalInBodyVO.setNnum(orderDetl.getQty()); generalInBodyVO.setNshouldnum(orderDetl.getAnfme()); generalInBodyVO.setVbatchcode(orderDetl.getBatch()); @@ -203,34 +206,7 @@ } private Object processQTRK(List<OrderDetl> orderDetls) { //组装对象数据 Map<String, Object> data = new HashMap<String, Object>(); GeneralInHeadVO generalInHeadVO = new GeneralInHeadVO(); generalInHeadVO.setPk_org("FYT"); generalInHeadVO.setCwarehouseid("6101"); GeneralInBodyVO generalInBodyVO = null; List<GeneralInBodyVO> generalInBodyVOS = new ArrayList<>(); for (OrderDetl orderDetl : orderDetls) { generalInBodyVO = new GeneralInBodyVO(); String remark = orderDetl.getRemark(); if (!Cools.isEmpty(remark)) { NccSaleXsfhmxWms nccSaleXsfhmxWms = JSONObject.parseObject(remark, NccSaleXsfhmxWms.class); generalInBodyVO.setCsourcetype("4331"); generalInBodyVO.setClocationid("610101"); generalInBodyVO.setCsourcebillbid(nccSaleXsfhmxWms.getCdeliverybid()); generalInBodyVO.setCsourcebillhid(nccSaleXsfhmxWms.getCdeliveryid()); generalInBodyVO.setNnum(orderDetl.getQty()); generalInBodyVO.setNshouldnum(orderDetl.getAnfme()); generalInBodyVO.setVbatchcode(orderDetl.getBatch()); generalInBodyVO.setCmaterialoid(orderDetl.getMatnr()); } generalInBodyVOS.add(generalInBodyVO); } data.put("GeneralInHeadVO", generalInHeadVO); data.put("GeneralInBodyVO", generalInBodyVOS); return data; } private Object processDBDD(List<OrderDetl> orderDetls) { //组装对象数据 @@ -259,33 +235,7 @@ } private Object processZK(List<OrderDetl> orderDetls) { //组装对象数据 Map<String, Object> data = new HashMap<String, Object>(); WhsTransBillHeaderVO whsTransBillHeaderVO = new WhsTransBillHeaderVO(); whsTransBillHeaderVO.setPk_org("FYT"); whsTransBillHeaderVO.setCwarehouseid("6101"); WhsTransBillBodyVO whsTransBillBodyVO = null; List<WhsTransBillBodyVO> whsTransBillBodyVOS = new ArrayList<>(); for (OrderDetl orderDetl : orderDetls) { whsTransBillBodyVO = new WhsTransBillBodyVO(); String remark = orderDetl.getRemark(); if (!Cools.isEmpty(remark)) { NccSaleXsfhmxWms nccSaleXsfhmxWms = JSONObject.parseObject(remark, NccSaleXsfhmxWms.class); whsTransBillBodyVO.setCsourcetype("4331"); whsTransBillBodyVO.setClocationid("610101"); whsTransBillBodyVO.setCsourcebillbid(nccSaleXsfhmxWms.getCdeliverybid()); whsTransBillBodyVO.setCsourcebillhid(nccSaleXsfhmxWms.getCdeliveryid()); whsTransBillBodyVO.setNnum(orderDetl.getQty()); whsTransBillBodyVO.setVbatchcode(orderDetl.getBatch()); whsTransBillBodyVO.setCmaterialoid(orderDetl.getMatnr()); } whsTransBillBodyVOS.add(whsTransBillBodyVO); } data.put("WhsTransBillHeaderVO", whsTransBillHeaderVO); data.put("WhsTransBillBodyVO", whsTransBillBodyVOS); return data; } private Object processCGDH(List<OrderDetl> orderDetls) { //组装对象数据 src/main/java/com/zy/nc/entity/NccJcQilibcBarcodeflowWms.java
@@ -32,6 +32,16 @@ /** * */ private String wlbm; /** * */ private String vbatchcode; /** * */ private String infla; /** @@ -68,6 +78,7 @@ * */ private Integer wmsFlag; /** * */ @@ -88,6 +99,8 @@ return (this.getPkBarcode() == null ? other.getPkBarcode() == null : this.getPkBarcode().equals(other.getPkBarcode())) && (this.getTs() == null ? other.getTs() == null : this.getTs().equals(other.getTs())) && (this.getVbarcode() == null ? other.getVbarcode() == null : this.getVbarcode().equals(other.getVbarcode())) && (this.getWlbm() == null ? other.getWlbm() == null : this.getWlbm().equals(other.getWlbm())) && (this.getVbatchcode() == null ? other.getVbatchcode() == null : this.getVbatchcode().equals(other.getVbatchcode())) && (this.getInfla() == null ? other.getInfla() == null : this.getInfla().equals(other.getInfla())) && (this.getAsnnum() == null ? other.getAsnnum() == null : this.getAsnnum().equals(other.getAsnnum())) && (this.getPkMaterial() == null ? other.getPkMaterial() == null : this.getPkMaterial().equals(other.getPkMaterial())) @@ -95,7 +108,8 @@ && (this.getMemo() == null ? other.getMemo() == null : this.getMemo().equals(other.getMemo())) && (this.getVbillno() == null ? other.getVbillno() == null : this.getVbillno().equals(other.getVbillno())) && (this.getNastnum() == null ? other.getNastnum() == null : this.getNastnum().equals(other.getNastnum())) && (this.getWmsFlag() == null ? other.getWmsFlag() == null : this.getWmsFlag().equals(other.getWmsFlag())); && (this.getWmsFlag() == null ? other.getWmsFlag() == null : this.getWmsFlag().equals(other.getWmsFlag())) && (this.getWmsMemo() == null ? other.getWmsMemo() == null : this.getWmsMemo().equals(other.getWmsMemo())); } @Override @@ -105,6 +119,8 @@ result = prime * result + ((getPkBarcode() == null) ? 0 : getPkBarcode().hashCode()); result = prime * result + ((getTs() == null) ? 0 : getTs().hashCode()); result = prime * result + ((getVbarcode() == null) ? 0 : getVbarcode().hashCode()); result = prime * result + ((getWlbm() == null) ? 0 : getWlbm().hashCode()); result = prime * result + ((getVbatchcode() == null) ? 0 : getVbatchcode().hashCode()); result = prime * result + ((getInfla() == null) ? 0 : getInfla().hashCode()); result = prime * result + ((getAsnnum() == null) ? 0 : getAsnnum().hashCode()); result = prime * result + ((getPkMaterial() == null) ? 0 : getPkMaterial().hashCode()); @@ -113,6 +129,7 @@ result = prime * result + ((getVbillno() == null) ? 0 : getVbillno().hashCode()); result = prime * result + ((getNastnum() == null) ? 0 : getNastnum().hashCode()); result = prime * result + ((getWmsFlag() == null) ? 0 : getWmsFlag().hashCode()); result = prime * result + ((getWmsMemo() == null) ? 0 : getWmsMemo().hashCode()); return result; } @@ -125,6 +142,8 @@ sb.append(", pkBarcode=").append(pkBarcode); sb.append(", ts=").append(ts); sb.append(", vbarcode=").append(vbarcode); sb.append(", wlbm=").append(wlbm); sb.append(", vbatchcode=").append(vbatchcode); sb.append(", infla=").append(infla); sb.append(", asnnum=").append(asnnum); sb.append(", pkMaterial=").append(pkMaterial); @@ -133,6 +152,7 @@ sb.append(", vbillno=").append(vbillno); sb.append(", nastnum=").append(nastnum); sb.append(", wmsFlag=").append(wmsFlag); sb.append(", wmsMemo=").append(wmsMemo); sb.append("]"); return sb.toString(); } src/main/java/com/zy/nc/entity/NccScZkmxbWms.java
@@ -1,10 +1,10 @@ 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 java.util.Date; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import lombok.Data; /** @@ -304,6 +304,7 @@ * */ private String bts; /** * */ @@ -378,7 +379,8 @@ && (this.getYingzsl() == null ? other.getYingzsl() == null : this.getYingzsl().equals(other.getYingzsl())) && (this.getYingzzsl() == null ? other.getYingzzsl() == null : this.getYingzzsl().equals(other.getYingzzsl())) && (this.getBdr() == null ? other.getBdr() == null : this.getBdr().equals(other.getBdr())) && (this.getBts() == null ? other.getBts() == null : this.getBts().equals(other.getBts())); && (this.getBts() == null ? other.getBts() == null : this.getBts().equals(other.getBts())) && (this.getWmsMemo() == null ? other.getWmsMemo() == null : this.getWmsMemo().equals(other.getWmsMemo())); } @Override @@ -443,6 +445,7 @@ result = prime * result + ((getYingzzsl() == null) ? 0 : getYingzzsl().hashCode()); result = prime * result + ((getBdr() == null) ? 0 : getBdr().hashCode()); result = prime * result + ((getBts() == null) ? 0 : getBts().hashCode()); result = prime * result + ((getWmsMemo() == null) ? 0 : getWmsMemo().hashCode()); return result; } @@ -510,6 +513,7 @@ sb.append(", yingzzsl=").append(yingzzsl); sb.append(", bdr=").append(bdr); sb.append(", bts=").append(bts); sb.append(", wmsMemo=").append(wmsMemo); sb.append("]"); return sb.toString(); } src/main/resources/com/zy/nc/mapper/NccSaleDbddWmsMapper.xml
File was deleted
