From 66df9cd1dd5591facda2c1ae17bff2abdf83ca4d Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Wed, 12 Mar 2025 14:51:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E9=A2=86=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asbusrepairbill/AsBusrepairBillMapper.xml | 18 +- .../AsBusrepairBillService.java | 5 +- .../AsBusrepairInventorybillService.java | 280 +++++++++--------- .../com/yxt/sms/apiadmin/SmsGoodsRest.java | 8 + .../yxt/sms/biz/smsgoods/SmsGoodsMapper.java | 6 +- .../yxt/sms/biz/smsgoods/SmsGoodsMapper.xml | 10 + .../yxt/sms/biz/smsgoods/SmsGoodsService.java | 4 + .../WmsInventoryRecordService.java | 15 +- .../wmsoutbill/WmsOutBillInventoryVo.java | 3 +- .../inventory/wmsoutbill/WmsOutBillMapper.xml | 2 +- .../wms/feign/sms/smsgoods/SmsGoodsFeign.java | 6 + 11 files changed, 206 insertions(+), 151 deletions(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml index 94112f95d7..fdf0e97dc4 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml @@ -252,19 +252,21 @@ LEFT JOIN as_busrepair_inventorybill as i ON d.billSid = i.sid LEFT JOIN as_busrepair_bill as b ON i.sourceBillSid = b.sid LEFT JOIN as_busrepair_bill_vech as v ON v.billSid = b.sid - where d.operUserSid = #{userSid} and d.state = 1 + where d.operUserSid = #{userSid} and d.state = 1 and d.isEnable = 1 and d.currentCount > 0 GROUP BY i.sourceBillSid) as a SELECT d.goodsSpuName goodsName, - d.count, + d.currentCount `count`, d.goodsSkuCode, d.operName `user`, IF (d.state = 2, TRUE, FALSE) AS state FROM as_busrepair_inventorybill_detail AS d LEFT JOIN as_busrepair_inventorybill AS i ON d.billSid = i.sid - where i.sourceBillSid = #{sid} + where i.sourceBillSid = #{sid} and d.isEnable = 1 and d.currentCount > 0 + SELECT + s.price + FROM + sms_goods AS s + WHERE + s.goodsID = #{goodsID} + AND s.useOrgSid = #{useOrgSid} + ORDER BY s.createTime DESC LIMIT 1 + diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsService.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsService.java index 71ae4f2a7d..2b3d69c83a 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsService.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsService.java @@ -63,4 +63,8 @@ public class SmsGoodsService extends MybatisBaseService createQueryWrapper(WmsInventoryRecordQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -100,6 +102,13 @@ public class WmsInventoryRecordService extends MybatisBaseService saveSmsGoods(@RequestBody SmsGoodsDto dto); + + @ApiOperation("根据goodsID,useOrgSis获取销售价") + @GetMapping("/selPriceByGoodsIDUserOrgSid") + public ResultBean selPriceByGoodsIDUserOrgSid(@RequestParam("goodsID") String goodsID, @RequestParam("useOrgSid") String useOrgSid); } From a7c3789ac13b7a14a964c26842ddde6597f6b159 Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Wed, 12 Mar 2025 15:23:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E9=A2=86=E6=96=992?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../as/api/asbusrepairinventorybill/AsBusrepairBillVo.java | 1 + .../yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java | 1 - .../AsBusrepairInventorybillMapper.xml | 3 ++- .../AsBusrepairInventorybillService.java | 2 -- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairBillVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairBillVo.java index c6855e29ef..96f7129509 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairBillVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairBillVo.java @@ -22,6 +22,7 @@ public class AsBusrepairBillVo { private String isGoOut; //是否外出 private String mobile; //联系电话 private String entryTime; //进厂日期 + private String nodeName; //环节名称 } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java index b61caa6974..741dfb8bd5 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java @@ -218,7 +218,6 @@ public class AsBusrepairBillRest { return asBusrepairBillService.createPdf(sid); } - ; //============================================================================== diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.xml index 375b68e08b..8c338993b3 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.xml @@ -92,7 +92,8 @@ '否' END AS isGoOut, a.mobile, - a.entryTime + a.entryTime, + a.nodeName FROM as_busrepair_bill AS a LEFT JOIN as_busrepair_bill_vech AS v ON a.sid = v.billSid diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java index 1c148aa29f..fa76967673 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java @@ -810,9 +810,7 @@ public class AsBusrepairInventorybillService extends MybatisBaseService