From 7401b4b696bf8469150aa45f65f91ed33e5bd76e Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 16 十月 2025 13:56:47 +0800
Subject: [PATCH] 修改bug
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/WarehouseGoodsDetailVo.java | 3 ++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java | 1 +
ruoyi-system/src/main/resources/mapper/system/TErpClinicWarehousingMapper.xml | 5 +++--
ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml | 2 +-
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpGoodsServiceImpl.java | 14 ++++++++++++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java | 8 ++++----
6 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java
index 9c88fb6..40d0237 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java
@@ -309,6 +309,7 @@
tErpClinicWarehousing.setWarehousingType(1);
tErpClinicWarehousing.setType(1);
tErpClinicWarehousing.setWarehouseNo("G"+ DateUtils.dateTimeNow());
+ tErpClinicWarehousing.setProcurementId(erpProcurement.getId());
erpClinicWarehousingService.save(tErpClinicWarehousing);
// goodsId分组
for (UpdateStatusProcurementDto updateStatusProcurementDto : dto.getList()) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java
index 206b2b6..c88d593 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java
@@ -85,11 +85,11 @@
public R<List<TSysAppUser>> pageList(@RequestBody TSysAppUserQuery query) {
LambdaQueryWrapper<TSysAppUser> eq = new LambdaQueryWrapper<TSysAppUser>().eq(TSysAppUser::getStatus, 1);
if(query.getNickName() != null && !query.getNickName().isEmpty()){
- eq.like(TSysAppUser::getNickName, query.getNickName());
+ eq.and(e->e.like(TSysAppUser::getNickName, query.getNickName()).or().like(TSysAppUser::getPhone, query.getNickName()));
}
- if(query.getPhone() != null && !query.getPhone().isEmpty()){
- eq.like(TSysAppUser::getPhone, query.getPhone());
- }
+// if(query.getPhone() != null && !query.getPhone().isEmpty()){
+// eq.like(TSysAppUser::getPhone, query.getPhone());
+// }
List<TSysAppUser> list = sysAppUserService.list(eq);
return R.ok(list);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpGoodsServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpGoodsServiceImpl.java
index 4da89fe..f0478aa 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpGoodsServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpGoodsServiceImpl.java
@@ -52,31 +52,37 @@
@Resource
private TErpSupplierInventoryMapper erpSupplierInventoryMapper;
+
@Resource
private TErpClinicInventoryMapper erpClinicInventoryMapper;
@Resource
private TErpSupplierInventoryGoodsMapper erpSupplierInventoryGoodsMapper;
+
@Resource
private TErpClinicInventoryGoodsMapper erpClinicInventoryGoodsMapper;
@Resource
private TErpSupplierWarehousingMapper erpSupplierWarehousingMapper;
+
@Resource
private TErpClinicWarehousingMapper erpClinicWarehousingMapper;
@Resource
private TErpSupplierWarehousingBatchMapper erpSupplierWarehousingBatchMapper;
+
@Resource
private TErpClinicWarehousingBatchMapper erpClinicWarehousingBatchMapper;
@Resource
private TErpSupplierOutboundMapper erpSupplierOutboundMapper;
+
@Resource
private TErpClinicOutboundMapper erpClinicOutboundMapper;
@Resource
private TErpSupplierOutboundGoodsMapper erpSupplierOutboundGoodsMapper;
+
@Resource
private TErpClinicOutboundGoodsMapper erpClinicOutboundGoodsMapper;
@@ -85,6 +91,10 @@
@Resource
private TCrmSupplierMapper crmSupplierMapper;
+
+ @Resource
+ private TErpProcurementMapper erpProcurementMapper;
+
@Override
@@ -412,8 +422,8 @@
warehouseGoodsDetailVo.setCreateTime(tErpClinicWarehousing.getCreateTime());
warehouseGoodsDetailVo.setCreateBy(tErpClinicWarehousing.getCreateBy());
if(tErpClinicWarehousing.getType()==1){
- TErpClinicInventory tErpClinicInventory = erpClinicInventoryMapper.selectById(tErpClinicWarehousing.getInventoryId());
- warehouseGoodsDetailVo.setInventoryNumber(tErpClinicInventory.getInventoryNumber());
+ TErpProcurement tErpProcurement = erpProcurementMapper.selectById(tErpClinicWarehousing.getProcurementId());
+ warehouseGoodsDetailVo.setInventoryNumber(tErpProcurement.getProcurementCode());
}
List<TErpClinicWarehousingBatch> tErpClinicWarehousingBatches = erpClinicWarehousingBatchMapper.selectList(new LambdaQueryWrapper<TErpClinicWarehousingBatch>().eq(TErpClinicWarehousingBatch::getWarehousingId, id));
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/WarehouseGoodsDetailVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/WarehouseGoodsDetailVo.java
index 41ec5c2..fbfe556 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/WarehouseGoodsDetailVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/WarehouseGoodsDetailVo.java
@@ -19,9 +19,10 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime;
- @ApiModelProperty(value = "盘点单号")
+ @ApiModelProperty(value = "采购单号")
private String inventoryNumber;
+
@ApiModelProperty(value = "入库商品")
private List<TErpClinicWarehousingBatch> list;
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TErpClinicWarehousingMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TErpClinicWarehousingMapper.xml
index 403690d..1291a1c 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TErpClinicWarehousingMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TErpClinicWarehousingMapper.xml
@@ -88,8 +88,9 @@
COALESCE(sum(t2.purchase_count), 0) - COALESCE(sum(t3.outbound_count), 0) as allNum,
SUM(t2.unit_amount * (t2.purchase_count - COALESCE(t3.outbound_count, 0))) as allTotalPrice,
- COALESCE(sum(t3.outbound_count), 0) as outNum
+ COALESCE(sum(t3.outbound_count), 0) as outNum,t4.create_time as createTime1
from t_erp_goods t1 left join t_erp_clinic_warehousing_batch t2 on t1.id = t2.goods_id
+ left join t_erp_clinic_warehousing t4 on t2.warehousing_id = t4.id
left join t_erp_clinic_outbound_goods t3 on t2.id = t3.warehousing_id
where t1.disabled = 0 and t2.id is not null
<if test="query.goodsName != null and query.goodsName != ''">
@@ -118,7 +119,7 @@
<if test="query.type != null and query.type ==1">
and o.warning_inventory > (o.allNum-o.outNum)
</if>
- order by o.create_time desc
+ order by o.createTime1 desc
</select>
<select id="warehousePageList" resultType="com.ruoyi.system.vo.TErpClinicWarehousePageListVO">
diff --git a/ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml
index 36a7739..f046cd9 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml
@@ -193,7 +193,7 @@
select * from (
SELECT t1.id,t2.warehouse_no,
t3.goods_name,t3.goods_source,
- t4.supplier_name,
+ case t3.goods_source when 1 then t4.supplier_name when 2 then t3.supplier_name end as supplierName,
t3.type_id,
t3.packing_unit_id,
t3.quasi_number,
--
Gitblit v1.7.1