From 0278c966c1c32fbd60dd25ea3d375fa5d5f916ad Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期三, 18 十二月 2024 11:10:10 +0800 Subject: [PATCH] #加字段+预留字段启用 --- src/main/java/com/zy/asrs/entity/WaitPakinLog.java | 9 +++++++++ src/main/java/com/zy/asrs/entity/WaitPakin.java | 9 +++++++++ src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 12 +++++++++++- src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 8 ++++++++ 4 files changed, 37 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java index 21a45ed..a7cb928 100644 --- a/src/main/java/com/zy/asrs/entity/WaitPakin.java +++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java @@ -152,6 +152,15 @@ @ApiModelProperty(value= "澶囨敞") private String memo; + @ApiModelProperty(value= "棰勭暀1") + private String temp1; + @ApiModelProperty(value= "棰勭暀1") + private String temp2; + @ApiModelProperty(value= "棰勭暀1") + private String temp3; + @ApiModelProperty(value= "棰勭暀1") + private String temp4; + public String getBeBatch$(){ if (null == this.beBatch){ return null; } switch (this.beBatch){ diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java index 2d0e335..c4583a2 100644 --- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java +++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java @@ -151,6 +151,15 @@ @ApiModelProperty(value= "澶囨敞") private String memo; + @ApiModelProperty(value= "棰勭暀1") + private String temp1; + @ApiModelProperty(value= "棰勭暀1") + private String temp2; + @ApiModelProperty(value= "棰勭暀1") + private String temp3; + @ApiModelProperty(value= "棰勭暀1") + private String temp4; + public String getBeBatch$(){ if (null == this.beBatch){ return null; } switch (this.beBatch){ diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java index 9a28eec..fda0cdf 100644 --- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java @@ -364,7 +364,9 @@ throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触"); } - DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getManu()); +// DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getManu()); + DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getSuppCode() + , orderDetl.getManu(),orderDetl.getSku(),orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2(),orderDetl.getTemp3(),orderDetl.getTemp4()); if (DetlDto.has(detlDtos, detlDto)) { DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch()); assert one != null; @@ -393,6 +395,14 @@ waitPakin.setModiTime(now); waitPakin.setManu(detlDto.getMark()); //鏍囪 waitPakin.setOrigin(order.getItemName());//浠撳簱 + waitPakin.setSupp(detlDto.getSuppName()); //渚涘簲鍟� + waitPakin.setSku(detlDto.getCustomer()); //瀹㈡埛鍚嶇О + waitPakin.setThreeCode(detlDto.getOrderNo()); //u8鍙戣繃鏉ョ殑璁㈠崟鍙� + waitPakin.setSuppCode(detlDto.getFromOrderNo()); //鏉ユ簮鍗曞彿 + waitPakin.setTemp1(detlDto.getTemp1()); + waitPakin.setTemp2(detlDto.getTemp2()); + waitPakin.setTemp3(detlDto.getTemp3()); + waitPakin.setTemp4(detlDto.getTemp4()); if (!waitPakinService.insert(waitPakin)) { throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗eけ璐�"); } diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java index da1864d..bbaa003 100644 --- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java @@ -147,6 +147,10 @@ orderDetl.setManu(detlDto.getMark()); orderDetl.setSupp(detlDto.getSuppName()); //渚涘簲鍟� orderDetl.setSku(detlDto.getCustomer()); + orderDetl.setTemp1(detlDto.getTemp1()); + orderDetl.setTemp2(detlDto.getTemp2()); + orderDetl.setTemp3(detlDto.getTemp3()); + orderDetl.setTemp4(detlDto.getTemp4()); if (!orderDetlService.insert(orderDetl)) { throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠$悊鍛�"); } @@ -289,6 +293,10 @@ orderDetl.setManu(detlDto.getMark()); orderDetl.setSupp(detlDto.getSuppName()); orderDetl.setSku(detlDto.getCustomer()); + orderDetl.setTemp1(detlDto.getTemp1()); + orderDetl.setTemp2(detlDto.getTemp2()); + orderDetl.setTemp3(detlDto.getTemp3()); + orderDetl.setTemp4(detlDto.getTemp4()); if (!orderDetlService.insert(orderDetl)) { throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠$悊鍛�"); } -- Gitblit v1.9.1