From bb8eb53759e626e4d8a2a6e7a15844f65babb87f Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Wed, 24 Apr 2024 10:40:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=80=81=E7=B3=BB?= =?UTF-8?q?=E7=BB=9FSQL=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/distribution/mapper/DistributionSignforMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index 8f326210d..ac7313aa9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -1179,7 +1179,7 @@ ldpl.quantity AS num, ldl.signfor_state AS type, ldl.scan_time AS operateTime, - ldl.created_user AS administratorsId, + ldl.create_user AS administratorsId, IF ( ldl.id IS NOT NULL, 1, ldl.id ) AS is_loading, 1 is_out, From ae3c1942ebb8665e3553610084beb5889ee5015b Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Wed, 24 Apr 2024 11:50:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=9B=B6=E6=8B=85=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E7=AD=BE=E6=94=B6=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E3=80=81=E7=AD=BE=E6=94=B6=E4=BA=BAID=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionSignforServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 527d551a6..958a5bddf 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -5510,6 +5510,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl Date: Wed, 24 Apr 2024 14:09:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF-=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=85=8D=E8=BD=BD=20=E5=B7=B2=E9=80=89=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/trunkline/controller/CarsLoadController.java | 5 +++-- .../com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java index 63a2c945c..edd5e07c6 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java @@ -6,6 +6,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.trunkline.dto.*; +import com.logpm.trunkline.entity.TrunklineCarsLoadEntity; import com.logpm.trunkline.service.ITrunklineCarsLoadService; import com.logpm.trunkline.vo.LoadingDetailExportVO; import com.logpm.trunkline.vo.TrunklineCarsLoadVO; @@ -17,7 +18,6 @@ import lombok.extern.slf4j.Slf4j; import org.springblade.common.exception.CustomerException; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.StringUtil; import org.springframework.web.bind.annotation.*; @@ -1200,9 +1200,10 @@ public class CarsLoadController { public void loadingDetailExport(@RequestBody LoadCarsDTO loadCarsDTO, HttpServletResponse response) { String method = "############loadingDetailExport: "; log.info(method+"请求参数{}",loadCarsDTO); + TrunklineCarsLoadEntity carsLoadEntity = carsLoadService.getById(loadCarsDTO.getLoadId()); List ls = carsLoadService.loadingDetailExport(loadCarsDTO); //导出ls - ExcelUtil.export(response, "未盘点任务数据" + DateUtil.time(), "未盘点任务数据数据表", ls, LoadingDetailExportVO.class); + ExcelUtil.export(response, "装车明细数据"+carsLoadEntity.getCarsNo(), "装车明细", ls, LoadingDetailExportVO.class); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml index 022f00be1..f9313a4ed 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml @@ -293,7 +293,7 @@ lww.remark remark, lww.waybill_type type, IFNULL(ltco.total_num,0) totalNum, - IF(lww.waybill_type = 1,count( ldpl.id ),SUM(ldpl.quantity)) stockNum, + IF(lww.waybill_type = 1,count( ldpl.id ),SUM(ldpl.quantity))-ltco.real_num stockNum, ltco.plan_num planNum, ltco.real_num realNum, IFNULL(TRUNCATE(lww.total_freight/lww.total_count,4),0) price, @@ -304,7 +304,6 @@ where ltco.load_id = #{param.loadId} and ltco.final_node_id = #{param.finalNodeId} and ldpl.is_deleted = 0 - and ldpl.order_package_status in ('20','30','60') and ldpl.warehouse_id = #{param.warehouseId}