From 6834adf0d51fb8f4c19e6588f3e02ac5b187087c Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 18 Jul 2023 17:30:00 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=8F=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/sync/SpsSyncDownloadController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java index b438c808..d9ba62af 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java @@ -734,7 +734,6 @@ public class SpsSyncDownloadController { List orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities(); for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) { if (orderInvoiceEntity.getOrderIdFk().equals(orderEntity.getBillNo())) { - orderInvoiceEntity.setId(IdUtil.getSnowflakeNextId()); orderInvoiceMapper.insert(orderInvoiceEntity); } } From d53659b2726a6444d51973133a1c79f60f1eaf26 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 19 Jul 2023 10:22:41 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicOrderPrintController.java | 29 ++++++++++++++++++- .../api/dao/inout/IoOrderDetailBizDao.java | 2 ++ .../inout/IoOrderDetailBizService.java | 2 ++ .../impl/IoOrderDetailBizServiceImpl.java | 5 ++++ .../mapper/inout/IoOrderDetailBizDao.xml | 7 +++++ 5 files changed, 44 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java index ac6661e8..65d19b38 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java @@ -20,6 +20,7 @@ import com.glxp.api.req.inout.InspectionPDFTemplateRequest; import com.glxp.api.req.purchase.FilterSupManufacturerRequest; import com.glxp.api.req.purchase.purPlanPrintRequest; import com.glxp.api.req.system.FilterPdfTemplateRequest; +import com.glxp.api.res.inout.IoOrderInvoiceResponse; import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; import com.glxp.api.service.basic.IBasicBussinessTypeService; @@ -122,6 +123,7 @@ public class BasicOrderPrintController { for (IoOrderDetailBizEntity obj : ioOrderDetailBizEntityList) { //查询产品表 UdiProductEntity udiProductEntity = udiProductService.findByUuid(obj.getUuidFk()); + List ioOrderInvoiceResponses = ioOrderDetailBizService.selectByorderIdFk(obj.getOrderIdFk()); //组装数据 Map bizData = new HashMap<>(); bizData.put("index", i); @@ -144,6 +146,19 @@ public class BasicOrderPrintController { bizData.put("manufactor", obj.getManufacturer()); bizData.put("zczbhhzbapzbh", obj.getCertCode() == null ? ' ' : obj.getCertCode()); bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc()); + bizData.put("cplb", udiProductEntity.getCplb() == null ? ' ' : udiProductEntity.getCplb()); + if(ioOrderInvoiceResponses != null && ioOrderInvoiceResponses.size()>0){ + String encode=""; + for (IoOrderInvoiceResponse respons : ioOrderInvoiceResponses) { + encode+=respons.getInvoiceEncode()+","; + } + encode = encode.substring(0,encode.length()-1); + bizData.put("invoiceEncode", encode == null ? ' ' : encode); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String dateStr = sdf.format(ioOrderInvoiceResponses.get(0).getCreateTime()); + bizData.put("createTime", dateStr == null ? ' ' : dateStr); + + } list.add(bizData); i++; } @@ -170,7 +185,7 @@ public class BasicOrderPrintController { } //查询产品表 UdiProductEntity udiProductEntity = udiProductService.findByUuid(ioOrderDetailBizEntity.getUuidFk()); - + List ioOrderInvoiceResponses = ioOrderDetailBizService.selectByorderIdFk(ioOrderDetailBizEntity.getOrderIdFk()); //组装数据 Map bizData = new HashMap<>(); bizData.put("index", i); @@ -193,6 +208,18 @@ public class BasicOrderPrintController { bizData.put("manufactor", ioOrderDetailBizEntity.getManufacturer()); bizData.put("zczbhhzbapzbh", ioOrderDetailBizEntity.getCertCode() == null ? ' ' : ioOrderDetailBizEntity.getCertCode()); bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc()); + bizData.put("cplb", udiProductEntity.getCplb() == null ? ' ' : udiProductEntity.getCplb()); + if(ioOrderInvoiceResponses != null && ioOrderInvoiceResponses.size()>0){ + String encode=""; + for (IoOrderInvoiceResponse respons : ioOrderInvoiceResponses) { + encode+=respons.getInvoiceEncode()+","; + } + encode = encode.substring(0,encode.length()-1); + bizData.put("invoiceEncode", encode == null ? ' ' : encode); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String dateStr = sdf.format(ioOrderInvoiceResponses.get(0).getCreateTime()); + bizData.put("createTime", dateStr == null ? ' ' : dateStr); + } list.add(bizData); i++; } diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java index c30b546f..a26a90c1 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java @@ -27,6 +27,8 @@ public interface IoOrderDetailBizDao extends BaseMapperPlus filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest); + List selectByorderIdFk(String orderIdFk); + IoOrderInvoiceResponse selectByinvoiceId(Long id); /** diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java index 5b0a9ffa..34d77e15 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java @@ -46,6 +46,8 @@ public interface IoOrderDetailBizService { List filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest); + List selectByorderIdFk(String orderIdFk); + IoOrderInvoiceResponse selectByinvoiceId(Long id); Boolean updateOrderDetailBiz(IoOrderDetailBizEntity ioOrderDetailBizEntity); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java index 70ced51f..46a7eb2c 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java @@ -191,6 +191,11 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { return ioOrderDetailBizDao.filterListInv(orderDetailBizRequest); } + @Override + public List selectByorderIdFk(String orderIdFk) { + return ioOrderDetailBizDao.selectByorderIdFk(orderIdFk); + } + @Override public IoOrderInvoiceResponse selectByinvoiceId(Long id) { return ioOrderDetailBizDao.selectByinvoiceId(id); diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml index ef29a18a..28da472e 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml @@ -81,6 +81,13 @@ where id = #{id} + + + + SELECT * + FROM thr_products + LEFT JOIN basic_udirel ON thr_products.id = basic_udirel.mainId + + + AND basic_udirel.id = #{relId} + + + + From 85a4d6a26efdeae133c9efef90198ac910d4deb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Thu, 20 Jul 2023 17:41:45 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/controller/auth/LoginController.java | 4 ++-- .../java/com/glxp/api/service/inout/IoOrderUtilsService.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/LoginController.java b/src/main/java/com/glxp/api/controller/auth/LoginController.java index 5ed72907..f88b1c13 100644 --- a/src/main/java/com/glxp/api/controller/auth/LoginController.java +++ b/src/main/java/com/glxp/api/controller/auth/LoginController.java @@ -390,8 +390,8 @@ public class LoginController extends BaseController { @PostMapping("/spms/sub/inv/warehouse/addOrder") public BaseResponse addOrder(@RequestBody ioUploadOrderResponse ioUploadOrderRespons) { - ioOrderUtilsService.getIoder(ioUploadOrderRespons); - return ResultVOUtils.success(); + String billNo = ioOrderUtilsService.getIoder(ioUploadOrderRespons); + return ResultVOUtils.success(billNo); } diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java b/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java index a9886529..11bef2f2 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java @@ -46,7 +46,7 @@ public class IoOrderUtilsService { @Value("${file_path}") private String filePath; - public boolean getIoder(ioUploadOrderResponse ioUploadOrderRespons) { + public String getIoder(ioUploadOrderResponse ioUploadOrderRespons) { List ioOrderDetailCodeEntityList = ioUploadOrderRespons.getIoOrderDetailCodeEntityList(); List ioCodeEntityList = ioUploadOrderRespons.getIoCodeEntityList(); @@ -286,7 +286,7 @@ public class IoOrderUtilsService { ioCodeTempDao.insertBatch(ioCodeTempEntities); ioOrderDetailResultDao.insertBatch(ioOrderDetailResultEntities); ioOrderInvoiceMapper.insertBatch(ioOrderInvoiceEntities); - return true; + return billNO; } }