From d9e1889fdac792f95df4593d63610f57864b06bd Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Fri, 18 Aug 2023 11:15:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BasicdataWarehouseController.java | 9 +++------ .../service/impl/BasicdataWarehouseServiceImpl.java | 1 - .../java/com/logpm/oldproject/mapper/AdvanceMapper.xml | 5 ++--- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java index 0d13de4d5..cbabb5604 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java @@ -29,11 +29,9 @@ import lombok.AllArgsConstructor; import javax.validation.Valid; -import org.springblade.common.utils.RedisUtil; import org.springblade.core.secure.BladeUser; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; -import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -44,7 +42,6 @@ import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.tool.constant.BladeConstant; import springfox.documentation.annotations.ApiIgnore; -import java.util.Date; import java.util.Map; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -105,9 +102,9 @@ BasicdataWarehouseController extends BladeController { // qw.lambda().eq(BasicdataWarehouseEntity::getDepartment, deptId); IPage page = warehouseService.page(Condition.getPage(query), qw); //TODO 这里将仓库的行政区域放到Service中通过缓存进行陪陪结果后返回给前端 - page.getRecords().forEach(basicdataWarehouseEntity -> { - - }); +// page.getRecords().forEach(basicdataWarehouseEntity -> { +// +// }); // IPage pages = warehouseService.page(Condition.getPage(query), Condition.getQueryWrapper(warehouseWarehouse, BasicdataWarehouseEntity.class)); return R.data(page); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java index 987d2f46f..07b3f5dff 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java @@ -31,7 +31,6 @@ import com.logpm.basicdata.service.IBasicdataWarehouseService; import com.logpm.basicdata.vo.BasicdataWarehouseVO; import com.logpm.basicdata.wrapper.BasicdataWarehouseWrapper; import lombok.AllArgsConstructor; -import org.springblade.common.utils.RedisUtil; import org.springblade.core.redis.cache.BladeRedis; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.xml index 29971a1c9..6afcc8901 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.xml +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.xml @@ -29,15 +29,14 @@ `customerName`, `customerPhone`, `customerRoad`, `systemType`, `storeNo`, `storeName`, `serialKey`, `serviceNum`, `matingCode`, `contractNum`, `leaveBehind`, `senderName`, `senderMobile`, `senderAddress`, `administrators_id`, `create_time`,`update_time`, `delete_time`, `cars_num`, `waybill_status`, `waybill_no`, `mctsTruck`, `warehouse_id`, `old_id`, `freeze`, - `delete_reason`, `delete_administrators_id`,`mctsTruckNo`,`siteName`,`siteCode`,`dealerName`,`dealerCode`) + `delete_reason`, `delete_administrators_id`) VALUES ( #{param.orderSelfNum}, #{param.siteName}, #{param.area}, #{param.orderTypeName}, #{param.orderClassName},#{param.type}, #{param.total}, #{param.mtdsNo}, #{param.firstPackName}, #{param.firstPackCode}, #{param.dealerCode}, #{param.dealerName}, #{param.dueDate},#{param.isOpai}, #{param.orderNum}, #{param.carrierName}, #{param.customerName},#{param.customerPhone}, #{param.customerRoad}, #{param.systemType}, #{param.storeNo}, #{param.storeName}, #{param.serialKey}, #{param.serviceNum},#{param.matingCode}, #{param.contractNum}, #{param.leaveBehind}, #{param.senderName}, #{param.senderMobile}, #{param.senderAddress}, #{param.administratorsId},NOW(),NOW(), #{param.deleteTime}, #{param.carsNum}, #{param.waybillStatus}, #{param.waybillNo}, #{param.mctsTruck}, #{param.warehouseId}, #{param.oldId},#{param.freeze}, #{param.deleteReason}, - #{param.deleteAdministratorsId}, - #{param.mctsTruckNo}, #{param.siteName}, #{param.siteCode},#{param.dealerName},#{param.dealerCode}, + #{param.deleteAdministratorsId} ); From de2c4f30a30d8650725a7a2ae64e0fde3ab3bb22 Mon Sep 17 00:00:00 2001 From: kilo Date: Fri, 18 Aug 2023 15:41:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=87=E8=B4=A7?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/entity/DistributionStockupInfoEntity.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupInfoEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupInfoEntity.java index a60e6303e..114ea22c8 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupInfoEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupInfoEntity.java @@ -46,6 +46,12 @@ public class DistributionStockupInfoEntity extends TenantEntity { */ @ApiModelProperty(value = "备货编号") private Long stockupId; + + /** + * 备货编号 + */ + @ApiModelProperty(value = "备货编号") + private String stockUpType; /** * 预留1 */