diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/SuperMarketErpApp.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/IntegratedApp.java
similarity index 100%
rename from pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/SuperMarketErpApp.java
rename to pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/IntegratedApp.java
diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports b/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports
new file mode 100644
index 000000000..fe7a6a9d5
--- /dev/null
+++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports
@@ -0,0 +1,3 @@
+#com.bsd.pjcloud.supermarketerp.api.feign.RemoteSupermarketCategoryService
+#com.bsd.pjcloud.supermarketerp.api.feign.RemoteSupermarketSpuService
+#com.bsd.pjcloud.supermarketerp.api.feign.RemoteSupermarketUnitSkuService
\ No newline at end of file
diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/application.yml b/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/application.yml
similarity index 100%
rename from pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/application.yml
rename to pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/application.yml
diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/logback-spring.xml b/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/logback-spring.xml
similarity index 100%
rename from pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/logback-spring.xml
rename to pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/logback-spring.xml
diff --git a/pjcloud-supermarket-erp/pom.xml b/pjcloud-integrated/pom.xml
similarity index 77%
rename from pjcloud-supermarket-erp/pom.xml
rename to pjcloud-integrated/pom.xml
index 4a05ca348..07a365a2d 100644
--- a/pjcloud-supermarket-erp/pom.xml
+++ b/pjcloud-integrated/pom.xml
@@ -10,12 +10,12 @@
5.7.0
- pjcloud-supermarket-erp
+ pjcloud-integrated
pom
- pjcloud-supermarket-erp-api
- pjcloud-supermarket-erp-biz
+ pjcloud-integrated-api
+ pjcloud-integrated-biz
diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/api/feign/packge-info.java b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/api/feign/packge-info.java
deleted file mode 100644
index 19bcac496..000000000
--- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/api/feign/packge-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- @author pigx archetype
- *
- * feign client 存放目录，注意 @EnablePigxFeignClients 的扫描范围
- */
-package com.bsd.pjcloud.erp.api.feign;
\ No newline at end of file
diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/constant/packge-info.java b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/constant/packge-info.java
deleted file mode 100644
index 3d3a3c964..000000000
--- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/constant/packge-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- * @author pigx archetype
- *
- * 常量和枚举定义
- */
-package com.bsd.pjcloud.erp.constant;
\ No newline at end of file
diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/entity/packge-info.java b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/entity/packge-info.java
deleted file mode 100644
index dce807af6..000000000
--- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/entity/packge-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- * @author pigx archetype
- *
- * 实体 存放目录
- */
-package com.bsd.pjcloud.erp.entity;
\ No newline at end of file
diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/supermarketerp/api/feign/RemoteSupermarketCategoryService.java b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/supermarketerp/api/feign/RemoteSupermarketCategoryService.java
deleted file mode 100644
index 4f1b90aa0..000000000
--- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/supermarketerp/api/feign/RemoteSupermarketCategoryService.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.bsd.pjcloud.supermarketerp.api.feign;
-
-
-import com.bsd.pjcloud.common.core.constant.ServiceNameConstants;
-import com.bsd.pjcloud.common.core.util.R;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-
-/**
- * @author zjf
- * @date 2018/6/22
- */
-@FeignClient(contextId = "remoteSupermarketCategoryServic", value = ServiceNameConstants.SUPERMARKET_SERVICE)
-public interface RemoteSupermarketCategoryService {
-
-
-
-
- /**
- * 查询所有的分类
- * @return R
- */
- @GetMapping("/supermarketCategory/simpleAll")
- R getSimpleAll();
-
-}
diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/supermarketerp/api/feign/RemoteSupermarketSpuService.java b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/supermarketerp/api/feign/RemoteSupermarketSpuService.java
deleted file mode 100644
index 2b75b0f35..000000000
--- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/supermarketerp/api/feign/RemoteSupermarketSpuService.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- *
- * Copyright (c) 2018-2025, pjcloud All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the pig4cloud.com developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: pjcloud
- *
- */
-
-package com.bsd.pjcloud.supermarketerp.api.feign;
-
-
-import com.bsd.pjcloud.common.core.constant.ServiceNameConstants;
-import com.bsd.pjcloud.common.core.util.R;
-import com.bsd.pjcloud.supermarketerp.dto.SupermarketSpuQueryDTO;
-import com.bsd.pjcloud.supermarketerp.dto.SupermarketSpuUpdateStockReqDTO;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
-/**
- * @author zjf
- * @date 2018/6/22
- */
-@FeignClient(contextId = "remoteSupermarketSpuService", value = ServiceNameConstants.SUPERMARKET_SERVICE)
-public interface RemoteSupermarketSpuService {
-
-
-
- /**
- * 查询所有的超市spu列表信息，根据条件
- * @return R
- */
- @PostMapping("/supermarketSpu/ad/selectListAll")
- R getSupermarketSpuScope(@RequestBody SupermarketSpuQueryDTO supermarketSpuQueryDTO);
-
-
-
- /**
- * 根据spu id 查询spu详情，详情包括辅助条码和包装单位基本信息
- * @param id
- * @return
- */
- @GetMapping("/supermarketSpu/ad/SpuDetails")
- R getSupermarketSpuDetailById(@RequestParam("id")Long id);
-
-
- /**
- * 更新库存
- * @param updateStockReqDTO
- * @return
- */
- @PostMapping("/supermarketSpu/ad/updateSpuStock")
- R updateSpuStock(@RequestBody SupermarketSpuUpdateStockReqDTO updateStockReqDTO);
-
-
-
-
-
- /**
- * 查询所有的超市spu列表信息，根据条件
- * @return R
- */
- @PostMapping("/supermarketSpu/app/selectListAll")
- R getSupermarketSpu(@RequestBody SupermarketSpuQueryDTO supermarketSpuQueryDTO);
-
-
- /**
- * 购物车效验库存
- * @param spuId
- * @param incrCount 扣减数量，正数负数都行
- * @return
- */
- @GetMapping("/supermarketSpu/app/checkSpuStock")
- R checkSpuStock(@RequestParam(value ="spuId")Long spuId,@RequestParam("incrCount")Integer incrCount);
-
-}
diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/supermarketerp/api/feign/RemoteSupermarketUnitSkuService.java b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/supermarketerp/api/feign/RemoteSupermarketUnitSkuService.java
deleted file mode 100644
index 7cb7606b6..000000000
--- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/supermarketerp/api/feign/RemoteSupermarketUnitSkuService.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *
- * Copyright (c) 2018-2025, pjcloud All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the pig4cloud.com developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: pjcloud
- *
- */
-
-package com.bsd.pjcloud.supermarketerp.api.feign;
-
-
-import com.bsd.pjcloud.common.core.constant.ServiceNameConstants;
-import com.bsd.pjcloud.common.core.util.R;
-import com.bsd.pjcloud.supermarketerp.vo.SupermarketUnitWithSpuVo;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * @author zjf
- * @date 2018/6/22
- */
-@FeignClient(contextId = "remoteSupermarketUnitSkuService", value = ServiceNameConstants.SUPERMARKET_SERVICE)
-public interface RemoteSupermarketUnitSkuService {
-
-
-
-
-
- /**
- * sku 包装单位
- * 根据包装ids查询
- * @param ids
- * @return
- */
- @PostMapping("/supermarketUnit/ad/getSupermarketUnits")
- R> getSupermarketUnits(@RequestBody List ids);
-}
diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports
deleted file mode 100644
index 6cc54168a..000000000
--- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports
+++ /dev/null
@@ -1,3 +0,0 @@
-com.bsd.pjcloud.supermarketerp.api.feign.RemoteSupermarketCategoryService
-com.bsd.pjcloud.supermarketerp.api.feign.RemoteSupermarketSpuService
-com.bsd.pjcloud.supermarketerp.api.feign.RemoteSupermarketUnitSkuService
\ No newline at end of file
diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/constant/InventoryTypeEnum.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/constant/InventoryTypeEnum.java
index 089c2020e..df80105e8 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/constant/InventoryTypeEnum.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/constant/InventoryTypeEnum.java
@@ -15,7 +15,8 @@ public enum InventoryTypeEnum {
CKRK("3", "CGRK"),
CKTH("4", "CGTH"),
LSCK("5", "LSCK"),
- LSTH("6", "LSTH")
+ LSTH("6", "LSTH"),
+ KCPD("7", "KCPD")
;
private final String type;
private final String value;
diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpInventoryRecordsEntity.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpInventoryRecordsEntity.java
index 01e9c9825..c34b004d3 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpInventoryRecordsEntity.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpInventoryRecordsEntity.java
@@ -175,4 +175,8 @@ public class SmErpInventoryRecordsEntity extends Model userIds = records.stream()
.map(SmErpInventoryRecordsEntity::getHandlerUserId)
.collect(Collectors.toSet());
+ //收集supplierIds
+ Set supplierIds = records.stream()
+ .map(SmErpInventoryRecordsEntity::getSupplierId)
+ .collect(Collectors.toSet());
//请求得到所有的userIds
Map userMap = remoteUserService.getUserMap(userIds).getData();
@@ -133,6 +146,9 @@ public class SmErpInventoryRecordsServiceImpl extends ServiceImpl spuMap = smErpSpuEntities.stream().collect(Collectors.toMap(SmErpSpuEntity::getId, spu -> spu));
+ List smErpSupplierEntities = smErpSupplierMapper.selectList(new LambdaQueryWrapper().in(SmErpSupplierEntity::getSupplierId, supplierIds));
+ Map supplierMap = smErpSupplierEntities.stream().collect(Collectors.toMap(SmErpSupplierEntity::getSupplierId, supplier -> supplier));
+
// 按采购计划分组商品名称
Map> planGoodsMap = cgPlanItemEntities.stream()
.collect(Collectors.groupingBy(
@@ -142,15 +158,18 @@ public class SmErpInventoryRecordsServiceImpl extends ServiceImpl {
//移动端自动扣款入库，无需经办人
if (null!=plan.getHandlerUserId()){
SysUser sysUser = userMap.getOrDefault(plan.getHandlerUserId(), new SysUser());
plan.setHandlerUserName(sysUser.getUsername());
- List names = planGoodsMap.getOrDefault(plan.getId(), Collections.emptyList());
- plan.setProductName(String.join(", ", names));
}
+ List names = planGoodsMap.getOrDefault(plan.getId(), Collections.emptyList());
+ plan.setProductName(String.join(", ", names));
+ String supplierName = supplierMap.getOrDefault(plan.getSupplierId(), new SmErpSupplierEntity()).getSupplierName();
+ plan.setSupplierName(supplierName);
});
return pageData;
@@ -331,9 +350,9 @@ public class SmErpInventoryRecordsServiceImpl extends ServiceImpl items = inventoryRecordEditDTO.getItems();
List smErpInventoryRecordsItemEntityList = BeanUtils.toBean(items, SmErpInventoryRecordsItemEntity.class);
- List updateItems = smErpInventoryRecordsItemEntityList.stream().
- filter(smErpInventoryRecordsItemEntity -> smErpInventoryRecordsItemEntity.getId() == null).collect(Collectors.toList());
List insertItems = smErpInventoryRecordsItemEntityList.stream().
+ filter(smErpInventoryRecordsItemEntity -> smErpInventoryRecordsItemEntity.getId() == null).collect(Collectors.toList());
+ List updateItems = smErpInventoryRecordsItemEntityList.stream().
filter(smErpInventoryRecordsItemEntity -> smErpInventoryRecordsItemEntity.getId() != null).collect(Collectors.toList());
smErpInventoryRecordsItemMapper.updateById(updateItems);
smErpInventoryRecordsItemMapper.insert(insertItems);
diff --git a/pom.xml b/pom.xml
index 56ee41567..ee9dadc19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,7 @@
pjcloud-app-server
pjcloud-thirdparty
pjcloud-canteen
-
+ pjcloud-integrated
pjcloud-wallet
pjcloud-supermarket
pjcloud-hardware
From b45f9251b328029f161534e2e8e02d56afc3657c Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Mon, 10 Mar 2025 16:14:07 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9C=8D=E5=8A=A1?=
=?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/java/com/bsd/pjcloud/integrated/IntegratedApp.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/IntegratedApp.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/IntegratedApp.java
index 59d5cd2c4..48afe3ba6 100644
--- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/IntegratedApp.java
+++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/IntegratedApp.java
@@ -1,4 +1,4 @@
-package com.bsd.pjcloud.supermarketerp;
+package com.bsd.pjcloud.integrated;
import com.bsd.pjcloud.common.feign.annotation.EnablePjcloudFeignClients;
import com.bsd.pjcloud.common.security.annotation.EnablePjcloudResourceServer;
@@ -17,8 +17,8 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@EnableDiscoveryClient
@EnablePjcloudResourceServer
@SpringBootApplication
-public class SuperMarketErpApp {
+public class IntegratedApp {
public static void main(String[] args) {
- SpringApplication.run(SuperMarketErpApp.class, args);
+ SpringApplication.run(IntegratedApp.class, args);
}
}
From d918b3b2eea22e6b0343748016e758364807a7fd Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Tue, 11 Mar 2025 19:27:32 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=9B=98=E7=82=B9-1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/bsd/pjcloud/canteen/test.java | 26 ++++++
.../InventoryRecordSaveItemDTO.java | 1 +
.../dto/inventoryrecords/PDItemSaveDTO.java | 86 +++++++++++++++++++
.../dto/inventoryrecords/PDSaveDTO.java | 69 +++++++++++++++
.../dto/inventoryrecords/PdUnitDto.java | 14 +++
.../SmErpInventoryRecordsItemEntity.java | 12 +++
.../supermarket/vo/cgplan/ErpUnitVo.java | 17 ++--
.../controller/SmErpCgPlanController.java | 5 +-
.../SmErpInventoryRecordsController.java | 12 +++
.../service/SmErpInventoryRecordsService.java | 8 ++
.../SmErpInventoryRecordsServiceImpl.java | 21 +++--
.../service/impl/SmErpSpuServiceImpl.java | 1 +
.../SmErpInventoryRecordsItemMapper.xml | 4 +
13 files changed, 263 insertions(+), 13 deletions(-)
create mode 100644 pjcloud-canteen/pjcloud-canteen-biz/src/test/java/com/bsd/pjcloud/canteen/test.java
create mode 100644 pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/PDItemSaveDTO.java
create mode 100644 pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/PDSaveDTO.java
create mode 100644 pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/PdUnitDto.java
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/test/java/com/bsd/pjcloud/canteen/test.java b/pjcloud-canteen/pjcloud-canteen-biz/src/test/java/com/bsd/pjcloud/canteen/test.java
new file mode 100644
index 000000000..eb74cf698
--- /dev/null
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/test/java/com/bsd/pjcloud/canteen/test.java
@@ -0,0 +1,26 @@
+package com.bsd.pjcloud.canteen;
+
+import com.baomidou.mybatisplus.core.toolkit.AES;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.nio.charset.Charset;
+
+@SpringBootTest(classes = CanteenApp.class)
+public class test {
+
+
+
+ @Test
+ public void testEnc() {
+
+ }
+
+ @Test
+ public void testDec() {
+
+ }
+}
diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryRecordSaveItemDTO.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryRecordSaveItemDTO.java
index 9d601bdc3..d45ee8992 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryRecordSaveItemDTO.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryRecordSaveItemDTO.java
@@ -51,4 +51,5 @@ public class InventoryRecordSaveItemDTO {
@Schema(description="包装单位id")
private Long unitId;
+
}
\ No newline at end of file
diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/PDItemSaveDTO.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/PDItemSaveDTO.java
new file mode 100644
index 000000000..9168866e1
--- /dev/null
+++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/PDItemSaveDTO.java
@@ -0,0 +1,86 @@
+package com.bsd.pjcloud.supermarket.dto.inventoryrecords;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ *
+ *
+ * @author zjf
+ * @date 2025-02-11 17:11:41
+ */
+@Data
+@Schema(description = "盘点-item")
+public class PDItemSaveDTO {
+
+
+ /**
+ * 库存商品id
+ */
+ @Schema(description="库存商品id")
+ private Long erpSpuId;
+
+
+ @Schema(description="账面数量")
+ private Double accountNumber;
+
+ @Schema(description="实际数量")
+ private Double realNumber;
+
+ @Schema(description="账面单价")
+ private Integer unitPrice;
+
+
+ /**
+ * 数据库意思就是实际单价，这里等价于盘点单价
+ */
+ @Schema(description="盘点单价")
+ private Integer realPrice;
+ /**
+ * 盘盈盘亏
+ */
+ @Schema(description="盈")
+ private Double profit;
+
+ /**
+ * 盘盈盘亏
+ */
+ @Schema(description="亏")
+ private Double loss;
+
+
+ /**
+ * 包装单位id
+ */
+ @Schema(description="包装单位id")
+ private Long unitId;
+
+
+
+
+ @Schema(description="盘后总数")
+ private Integer totalNumber;
+
+ /**
+ * 累计总金额
+ */
+ @Schema(description="盘后总金额")
+ private Integer totalAmount;
+
+
+ /**
+ * 1等于盘盈 2等于盘亏
+ */
+ @Schema(description="订单类型,1入库，2出库")
+ private String orderType;
+
+ /**
+ * 备注
+ */
+ @Schema(description="备注")
+ private String remark;
+
+
+}
\ No newline at end of file
diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/PDSaveDTO.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/PDSaveDTO.java
new file mode 100644
index 000000000..f968794e8
--- /dev/null
+++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/PDSaveDTO.java
@@ -0,0 +1,69 @@
+package com.bsd.pjcloud.supermarket.dto.inventoryrecords;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ *
+ * 新增一个采购计划
+ */
+@Data
+@Schema(description = "盘点保存对象")
+public class PDSaveDTO {
+
+
+ /**
+ * 采编号
+ */
+ @Schema(description="编号")
+ private String inventoryCode;
+
+ /**
+ * 采购计划单据日期
+ */
+ @Schema(description="单据日期")
+ private LocalDate inventoryDate;
+
+ /**
+ * 仓库id
+ */
+ @Schema(description="仓库id")
+ private String warehouseId;
+
+ /**
+ * 经办人id
+ */
+ @Schema(description="经办人id")
+ private Long handlerUserId;
+
+
+
+ /**
+ * 备注
+ */
+ @Schema(description="备注")
+ private String remark;
+
+
+ /**
+ * 单据类型(字典inventory_type)采购入库、采购退货、盘点入库等
+ */
+ @Schema(description="单据类型(字典inventory_type)采购入库、采购退货、盘点入库等")
+ private String inventoryType;
+
+
+ /**
+ * @Link SmCgPlanSaveItemDTO
+ */
+ @Schema(description="采购计划-item")
+ private List items;
+
+
+
+
+}
diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/PdUnitDto.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/PdUnitDto.java
new file mode 100644
index 000000000..6d56b4532
--- /dev/null
+++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/PdUnitDto.java
@@ -0,0 +1,14 @@
+package com.bsd.pjcloud.supermarket.dto.inventoryrecords;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class PdUnitDto {
+
+ @Schema(description = "包装单位id")
+ private Long unitId;
+
+ @Schema(description = "对应包装单位填的数量")
+ private Integer unitNumber;
+}
diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpInventoryRecordsItemEntity.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpInventoryRecordsItemEntity.java
index 627d47210..2596741f8 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpInventoryRecordsItemEntity.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpInventoryRecordsItemEntity.java
@@ -154,4 +154,16 @@ public class SmErpInventoryRecordsItemEntity extends Model 元
- @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
+// @JsonSerialize(using = MoneySerializer.class) // 分 -> 元
+// @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
private Integer purchasePrice;
/**
* 零售价（分为单位）
*/
@Schema(description="零售价（分为单位）")
- @JsonSerialize(using = MoneySerializer.class) // 分 -> 元
- @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
+// @JsonSerialize(using = MoneySerializer.class) // 分 -> 元
+// @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
private Integer retailPrice;
/**
* 成本单价，单位： 分
*/
@Schema(description="成本单价，单位： 分")
- @JsonSerialize(using = MoneySerializer.class) // 分 -> 元
- @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
+// @JsonSerialize(using = MoneySerializer.class) // 分 -> 元
+// @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
private Integer costPrice;
+
+
+ @Schema(description="是否基础单位")
+ private Boolean isBase;
+
}
diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCgPlanController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCgPlanController.java
index afb1a4e0d..3e3062491 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCgPlanController.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCgPlanController.java
@@ -78,12 +78,13 @@ public class SmErpCgPlanController {
/**
- * 采购计划选择商品分页数据
+ * 通用的，迁移到公共接口
+ * 选择商品分页数据
* 分页查询
* @param page 分页对象
* @return
*/
- @Operation(summary = "采购计划选择商品分页数据" , description = "采购计划选择商品分页数据" )
+ @Operation(summary = "选择商品分页数据" , description = "选择商品分页数据" )
@GetMapping("/erpSpuPage" )
@PreAuthorize("@pms.hasPermission('supermarket_smErpInventoryRecords_view')" )
public R getErpSpuPage(@ParameterObject Page page, @ParameterObject ErpCgPlanDTO erpCgPlanDTO) {
diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpInventoryRecordsController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpInventoryRecordsController.java
index c9fe55898..b763c2e91 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpInventoryRecordsController.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpInventoryRecordsController.java
@@ -245,4 +245,16 @@ public class SmErpInventoryRecordsController {
public R getInventoryTypeSumPage(@ParameterObject Page page, @ParameterObject InventoryDetailQueryDTO inventoryDetailQueryDTO) {
return R.ok(smErpInventoryRecordsService.getInventoryTypeSumPage(page, inventoryDetailQueryDTO));
}
+
+
+
+
+ @Operation(summary = "库存盘点新增" , description = "库存盘点新增" )
+ @SysLog("库存盘点新增" )
+ @PostMapping
+ @PreAuthorize("@pms.hasPermission('supermarket_smErpInventoryRecords_add')" )
+ public R save(@RequestBody PDSaveDTO pdSaveDTO) {
+ return R.ok(smErpInventoryRecordsService.savePD(pdSaveDTO));
+ }
+
}
\ No newline at end of file
diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpInventoryRecordsService.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpInventoryRecordsService.java
index cf1e077ca..60a574817 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpInventoryRecordsService.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpInventoryRecordsService.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.bsd.pjcloud.supermarket.dto.inventoryrecords.InventoryDetailQueryDTO;
import com.bsd.pjcloud.supermarket.dto.inventoryrecords.InventoryRecordEditDTO;
import com.bsd.pjcloud.supermarket.dto.inventoryrecords.InventoryRecordSaveDTO;
+import com.bsd.pjcloud.supermarket.dto.inventoryrecords.PDSaveDTO;
import com.bsd.pjcloud.supermarket.entity.SmErpInventoryRecordsEntity;
import java.util.ArrayList;
@@ -81,4 +82,11 @@ public interface SmErpInventoryRecordsService extends IService list);
+
+ /**
+ * 库存盘点新增
+ * @param pdSaveDTO
+ * @return
+ */
+ Object savePD(PDSaveDTO pdSaveDTO);
}
\ No newline at end of file
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 b1e74998d..b0d44f74d 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
@@ -83,10 +83,6 @@ public class SmErpInventoryRecordsServiceImpl extends ServiceImpl items = pdSaveDTO.getItems();
+
+ int insert = baseMapper.insert(smErpCgDdEntity);
+ List cgPlanItemEntities = BeanUtils.toBean(items, SmErpInventoryRecordsItemEntity.class);
+
+ return null;
+ }
+
}
\ No newline at end of file
diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java
index 38f2239c2..48b720ae2 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java
@@ -468,6 +468,7 @@ public class SmErpSpuServiceImpl extends ServiceImpl {
List unitEntities = unitList.stream().filter(unit -> unit.getSpuId().equals(vo.getId())).collect(Collectors.toList());
List bean = BeanUtils.toBean(unitEntities, ErpUnitVo.class);
+ bean.sort(Comparator.comparing(ErpUnitVo::getPackageNum));
vo.setErpUnitVos(bean);
//库存
SmErpStockEntity smErpStockEntity = stockMap.get(vo.getId());
diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpInventoryRecordsItemMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpInventoryRecordsItemMapper.xml
index 0a83377bb..5a2470bfe 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpInventoryRecordsItemMapper.xml
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpInventoryRecordsItemMapper.xml
@@ -25,6 +25,10 @@
+
+
+
+