From 5976022aaabab88496694862e4ad360d16a1b7ac Mon Sep 17 00:00:00 2001 From: liuxy Date: Thu, 11 Apr 2024 14:53:47 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A1.=E6=8A=A5=E5=BA=9F=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=9B=9E=E4=BC=A0=E4=BF=AE=E6=94=B92.=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E9=A1=B5=E9=9D=A2=E5=AF=BC=E5=85=A5excel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/wms/basedata/st/wql/stivt.xls | Bin 325632 -> 326144 bytes .../inbill/service/CheckOutBillService.java | 9 ++ .../outbill/rest/CheckOutBillController.java | 11 +- .../service/impl/CheckOutBillServiceImpl.java | 77 ++++++++++++ .../impl/InAndOutRetrunServiceImpl.java | 23 +++- .../st/returns/wql/QST_IVT_INANDOUTRETRUN.wql | 1 + .../src/views/wms/st/outbill/UploadDialog.vue | 117 ++++++++++++++++++ .../src/views/wms/st/outbill/checkoutbill.js | 9 +- .../src/views/wms/st/outbill/index.vue | 21 +++- 9 files changed, 261 insertions(+), 7 deletions(-) create mode 100644 lms/nladmin-ui/src/views/wms/st/outbill/UploadDialog.vue diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls index 706870f4826956cedb429850ca3986cd8d6aa628..11d72fd3bddc329a214084aa8b8427468078ec5e 100644 GIT binary patch delta 32554 zcma)l2Y6J)_x9Ymn`9G60)apXEeRbd=_C{hq|l4fNx%RB0s%r7MO;v-paK!Dph#~@ z6OdrTP?X+5iqa88q>88@@V#?p?rhdSzvubbXSqAGGv__$%*>f{&fL2hf49W=2PI}^ z@MnfKbevSE1#%NE00TGv3tBaV+qBJCxs=2F;)=vhO;Dl z!-+5Szngq?M8>gAy#`%w$4~IQ@QF3~NqPBEUQWr&X?Zy#FK6ZDCvgeQd-iRyO-sKG zHS(@Z3NmiwMQtdPmo(XH)3@6W1iR|=G=RkoBcr!9i4|j``iru|n9{dT_JipG{Y2f| zp|Wmh-ywa*zA?RvsJk^$)?I09j0qno>H^q5Q$?L=WKWG47yOE7_2CDy)$z7@Js)*R z8YAlZ1aLyg>)ADZaokw%k)m>1l&n17c2)buR9BMyRo_HIZ{v8|HtoD$ZZm7wv@$P? zwwqezH9Fa`MpfRgkft~bWbAG+L4|qWy$e|5E@O>QYPf0J$)Ak8gC~pT%{vw9^NWvY zcy7~Ir`8&?&u;d51zq-T`todZ!@BZ?QNvo;kvpyR_%AQg;nbyoy!B@ytodIUrSdBN z9OUtRu}w98E^7GK1z<%7RLOkqR?Z7|1b2QWcq#NRB|ie+-Gorw(UEU1GVMZ_2P;~Y zs@-)-y^YVl-hcw0}{X-bYphzObb7 zw1U(#bq*|#{V2X>>+dd%yK^8TD=fR=&fMFH*FU-Q`25%JP5s&HgR0wOKO6r=e69O? zf?IsNZA{v(S-WTcw8&LAf6$&4ixWai-WZi~e(>3kasv0BYP>FNd`8nXB?``TxZZ9@ zY;9xKh%T--m+gP^*Yc}N`tI7$sj7d~fVWx}te#oy$C_QIUWynpz4g&

1lHJzXXw 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 KYAwC%^8SA+?vFPB diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/CheckOutBillService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/CheckOutBillService.java index f1cf33c5a..ddb2ffe01 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/CheckOutBillService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/CheckOutBillService.java @@ -3,7 +3,9 @@ package org.nl.wms.st.inbill.service; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.springframework.data.domain.Pageable; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; @@ -303,4 +305,11 @@ public interface CheckOutBillService { * } */ JSONObject updataIsOverdue(JSONObject whereJson); + + /** + * 导入运费 + * @param file、 + * @param request、 + */ + void importExcel(MultipartFile file, HttpServletRequest request); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java index 67455fed7..02535025b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java @@ -1,5 +1,6 @@ package org.nl.wms.st.outbill.rest; +import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -9,7 +10,9 @@ import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; @@ -313,10 +316,16 @@ public class CheckOutBillController { checkOutBillService.download(map, response, stor_id, bill_status, bill_type); } - @PostMapping("/updataIsOverdue") @Log("更新是否超期") public ResponseEntity updataIsOverdue(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(checkOutBillService.updataIsOverdue(whereJson),HttpStatus.OK); } + + @PostMapping("/importExcel") + @SaIgnore + public ResponseEntity importExcel(@RequestParam("file") MultipartFile file, HttpServletRequest request) { + checkOutBillService.importExcel(file, request); + return new ResponseEntity<>(HttpStatus.OK); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index 78f7c64e9..421770b89 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -6,6 +6,8 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.poi.excel.ExcelReader; +import cn.hutool.poi.excel.ExcelUtil; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.write.metadata.WriteSheet; @@ -39,10 +41,13 @@ import org.nl.wms.util.TranUtil; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.io.InputStream; import java.util.*; import java.util.function.Consumer; import java.util.stream.Collectors; @@ -1048,6 +1053,78 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { return result; } + @Override + @Transactional(rollbackFor = Exception.class) + public void importExcel(MultipartFile file, HttpServletRequest request) { + // 明细 + WQLObject dtl = WQLObject.getWQLObject("st_ivt_iostorinvdtl"); + // 主表 + WQLObject mst = WQLObject.getWQLObject("st_ivt_iostorinv"); + // 物流公司 + WQLObject tran = WQLObject.getWQLObject("MD_CS_TransportationBase"); + + // 1.获取上传文件输入流 + InputStream inputStream = null; + + try { + inputStream = file.getInputStream(); + } catch (Exception e) { + e.printStackTrace(); + } + + // 查询所有物流公司 + List tranList = tran.query("is_used = '1' and is_delete = '0'") + .getResultJSONArray(0).toJavaList(JSONObject.class); + + ExcelReader excelReader = ExcelUtil.getReader(inputStream); + List> read = excelReader.read(1, excelReader.getRowCount()); + + for (int i = 0; i < read.size(); i++) { + List list = read.get(i); + + // 交货单 + String vbeln = list.get(0).toString(); + + if (ObjectUtil.isEmpty(vbeln)) { + continue; + } + + // 根据交货单找到主单据 + JSONObject jsonDtl = dtl.query("vbeln = '" + vbeln + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(jsonDtl)) { + continue; + } + JSONObject jsonMst = mst.query("iostorinv_id = '" + jsonDtl.getString("iostorinv_id") + "'").uniqueResult(0); + + // 物流公司名称 + String cust_name = list.get(1).toString(); + // 匹配对应的物流公司 + JSONObject jsonTran = tranList.stream() + .filter(row -> row.getString("cust_name").equals(cust_name)) + .findFirst().orElse(null); + + // 运单号 + String order_number = list.get(2).toString(); + + // 车型 + String car_type = list.get(3).toString(); + + // 其他费用 + String other_freight = list.get(4).toString(); + + // 其他费用 + String estimated_freight = list.get(5).toString(); + + // 更新主表 + jsonMst.put("trans_code", ObjectUtil.isNotEmpty(jsonTran) ? jsonTran.getString("cust_code") : "" ); + jsonMst.put("order_number", order_number); + jsonMst.put("car_type", car_type); + jsonMst.put("other_freight", other_freight); + jsonMst.put("estimated_freight", estimated_freight); + mst.update(jsonMst); + } + } + @Override @Transactional(rollbackFor = Exception.class) public void update(JSONObject whereJson) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java index 4d354ec92..70b964b6c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java @@ -410,10 +410,14 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { // List planList = WQLObject.getWQLObject("pdm_bi_slittingproductionplan").query("container_name in ('" + pcsn_in + "')").getResultJSONArray(0).toJavaList(JSONObject.class); - JSONObject param = new JSONObject(); - JSONArray item = new JSONArray(); + // 查询仓库 + JSONObject jsonStor = WQLObject.getWQLObject("st_ivt_bsrealstorattr") + .query("stor_code = '" + jo_mst.getString("stor_code") + "'").uniqueResult(0); for (int j = 0; j < disArr.size(); j++) { + JSONObject param = new JSONObject(); + JSONArray item = new JSONArray(); + JSONObject json = disArr.getJSONObject(j); JSONObject jsonDtl = new JSONObject(); @@ -436,9 +440,20 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { } jsonDtl.put("Details", details); item.add(jsonDtl); + + param.put("Items", item); + + // 仓库编码 + param.put("WareHouse", jsonStor.getString("ext_id")); + // new LmsToMesServiceImpl().ChildScrapUpdate(param); + + // 更新分配回传成功 + JSONObject jsonUpdate = new JSONObject(); + jsonUpdate.put("is_upload", "1"); + + WQLObject.getWQLObject("st_ivt_iostorinvdis") + .update(jsonUpdate,"iostorinv_id = '"+jo_mst.getString("iostorinv_id")+"' and box_no = '"+json.getString("box_no")+"'"); } - param.put("Items", item); - new LmsToMesServiceImpl().ChildScrapUpdate(param); jo_mst.put("upload_mes", "1"); jo_mst.put("is_upload", "1"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql index 0a69c811e..e77bebdee 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql @@ -210,6 +210,7 @@ LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id WHERE dis.iostorinv_id = 输入.iostorinv_id + AND dis.is_upload <> '1' GROUP BY dis.box_no ENDSELECT diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/UploadDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/UploadDialog.vue new file mode 100644 index 000000000..f918aa522 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/st/outbill/UploadDialog.vue @@ -0,0 +1,117 @@ + + + + diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/checkoutbill.js b/lms/nladmin-ui/src/views/wms/st/outbill/checkoutbill.js index 289a2d586..2aa093377 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/checkoutbill.js +++ b/lms/nladmin-ui/src/views/wms/st/outbill/checkoutbill.js @@ -248,4 +248,11 @@ export function updataIsOverdue(data) { data }) } -export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, getOutBillDis2, setPoint, oneSetPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType, allDivOne, moneySubmit, getDisNum, queryBox, getOutBillTask2, oneCancel, cancelTask, allSetPoint, oneSetPoint2, outReturn, updataIsOverdue } +export function excelImport(data) { + return request({ + url: '/api/checkoutbill/importExcel', + method: 'post', + data + }) +} +export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, getOutBillDis2, setPoint, oneSetPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType, allDivOne, moneySubmit, getDisNum, queryBox, getOutBillTask2, oneCancel, cancelTask, allSetPoint, oneSetPoint2, outReturn, updataIsOverdue, excelImport } diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue index 716565c56..bf006c4c0 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue @@ -251,6 +251,16 @@ > 导出Excel + + 导入运费 + + @@ -350,6 +361,7 @@ import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' import AddDialog from '@/views/wms/st/outbill/AddDialog' import MoneyDialog from '@/views/wms/st/outbill/MoneyDialog' +import UploadDialog from '@/views/wms/st/outbill/UploadDialog' import DivDialog from '@/views/wms/st/outbill/DivDialog' import TaskDialog from '@/views/wms/st/outbill/TaskDialog' import ViewDialog from '@/views/wms/st/outbill/ViewDialog' @@ -361,7 +373,7 @@ const start = new Date() export default { name: 'Checkoutbill', - components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, DivDialog, TaskDialog, MoneyDialog }, + components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, DivDialog, TaskDialog, MoneyDialog, UploadDialog }, cruds() { return CRUD({ title: '用户', idField: 'iostorinv_id', url: 'api/checkoutbill', crudMethod: { ...checkoutbill }, optShow: { @@ -399,6 +411,7 @@ export default { openParamMoney: null, mstrow: {}, viewShow: false, + uploadDialogShow: false, currentRow: null, checkrows: [], storlist: [], @@ -620,6 +633,12 @@ export default { }).catch(() => { crud.downloadLoading = false }) + }, + Import() { + this.uploadDialogShow = true + }, + tableChanged() { + this.crud.toQuery() } } }