From c4e6a903b89f863429c748461b2af31e0c9c5201 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Fri, 30 May 2025 12:41:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B4=A7=E5=95=86=E7=B1=BB=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SmErpSupplierTypeController.java | 2 +- .../supermarket/service/SmErpSupplierTypeService.java | 5 +++++ .../service/impl/SmErpSupplierTypeServiceImpl.java | 9 +++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSupplierTypeController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSupplierTypeController.java index c58737e89..6662305cf 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSupplierTypeController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSupplierTypeController.java @@ -129,7 +129,7 @@ public class SmErpSupplierTypeController { @Operation(summary = "下拉查询" ) @GetMapping("/simpleAll") public R getSimpleAll() { - List list = smErpSupplierTypeService.list(); + List list = smErpSupplierTypeService.selectSimpleAllScope(); List bean = BeanUtils.toBean(list, SmErpSupplierTypeSimpleVo.class); return R.ok(bean); } diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSupplierTypeService.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSupplierTypeService.java index f32212235..2cef9f322 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSupplierTypeService.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSupplierTypeService.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.bsd.pjcloud.supermarket.entity.SmErpSupplierTypeEntity; +import java.util.List; + public interface SmErpSupplierTypeService extends IService { @@ -16,4 +18,7 @@ public interface SmErpSupplierTypeService extends IService wrapper); + + + List selectSimpleAllScope(); } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSupplierTypeServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSupplierTypeServiceImpl.java index 6f4d2d81f..bf703cac8 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSupplierTypeServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSupplierTypeServiceImpl.java @@ -7,7 +7,11 @@ import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.supermarket.entity.SmErpSupplierTypeEntity; import com.bsd.pjcloud.supermarket.mapper.SmErpSupplierTypeMapper; import com.bsd.pjcloud.supermarket.service.SmErpSupplierTypeService; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; + +import java.util.List; + /** * 货商类别 * @@ -20,4 +24,9 @@ public class SmErpSupplierTypeServiceImpl extends ServiceImpl wrapper) { return baseMapper.selectPageByScope(page,wrapper, DataScope.of()); } + + @Override + public List selectSimpleAllScope() { + return baseMapper.selectListByScope(null, DataScope.of()); + } } \ No newline at end of file From 6f790a6a2332e7c5694d7e0aafcf7993ef37c151 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Wed, 4 Jun 2025 21:10:01 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SmErpInventoryRecordsServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpInventoryRecordsServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpInventoryRecordsServiceImpl.java index d6d7daffe..7ce471126 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpInventoryRecordsServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpInventoryRecordsServiceImpl.java @@ -441,6 +441,7 @@ public class SmErpInventoryRecordsServiceImpl extends ServiceImpl items = inventoryRecordEditDTO.getItems(); @@ -475,6 +476,11 @@ public class SmErpInventoryRecordsServiceImpl extends ServiceImpl updateItems = smErpInventoryRecordsItemEntityList.stream(). filter(smErpInventoryRecordsItemEntity -> smErpInventoryRecordsItemEntity.getId() != null).collect(Collectors.toList()); + // 为新增的项目设置inventoryId和deptId + insertItems.forEach(insertItem -> { + insertItem.setInventoryId(inventoryRecordEditDTO.getId()); + insertItem.setDeptId(deptId); + }); //更新的话，查询之前保存了哪些item，然后去库存表删掉从新计算库存 List dataBaseSmErpInventoryRecordsItemEntityList = smErpInventoryRecordsItemMapper From cc09af32585560f8c3e9b92fc9f837af610e7578 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Thu, 5 Jun 2025 10:36:13 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E8=B6=85=E5=B8=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supermarket/controller/SmSpuController.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java index e819b1f23..f8d3103c8 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java @@ -93,13 +93,13 @@ public class SmSpuController { public R save(@RequestBody SmSpuEntity smSpu) { Long deptId = SecurityUtils.getUser().getDeptId(); //查询商户，设置商户id - R byDeptId = remoteMchService.getByDeptId(deptId, MerchantTypeEnum.SELF_SUPERMARKET); - MchManageVo data = byDeptId.getData(); - if (Objects.isNull(data) || !data.getTypes().contains("2")){ - return R.failed("当前用户未绑定超市商户"); - } +// R byDeptId = remoteMchService.getByDeptId(deptId, MerchantTypeEnum.SELF_SUPERMARKET); +// MchManageVo data = byDeptId.getData(); +// if (Objects.isNull(data) || !data.getTypes().contains("2")){ +// return R.failed("当前用户未绑定超市商户"); +// } smSpu.setDeptId(deptId); - smSpu.setMerchantId(data.getId()); +// smSpu.setMerchantId(data.getId()); return R.ok(smSpuService.save(smSpu)); } From 7bb990690b378f5ce4125a8838defac1ed8732aa Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Thu, 5 Jun 2025 10:45:21 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E8=B6=85=E5=B8=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/SmSpuMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmSpuMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmSpuMapper.xml index 076a8194f..6e0b13f83 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmSpuMapper.xml +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmSpuMapper.xml @@ -30,7 +30,7 @@ on sp.erp_spu_id = esp.id left join sm_erp_category eca on esp.category_id = eca.id - + where sp.del_flag = 0