From 765e72ab71b29c3d23300cd5ac624827f26eab64 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 07 四月 2025 17:39:24 +0800
Subject: [PATCH] 组拖源修改

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java |   24 ++++++++++++++++++++++--
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java  |   17 +++++++++++++++--
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index b6536c2..9cb4786 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -2,6 +2,7 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.vincent.rsf.framework.common.Cools;
 import com.vincent.rsf.framework.common.R;
 import com.vincent.rsf.framework.exception.CoolException;
@@ -291,7 +292,7 @@
                     .setSplrBatch(dto.getSplrBatch())
                     .setMatnrCode(matnr.getCode())
                     .setMatnrId(matnr.getId())
-                    .setMatnrName(matnr.getName())
+                    .setMaktx(matnr.getName())
                     //搴撳瓨鍗曚綅涓烘渶灏忓崟浣�
                     .setUnit(dto.getStockUnit())
                     .setStockUnit(dto.getStockUnit())
@@ -377,9 +378,28 @@
         return fieldsMapper.selectList(new LambdaQueryWrapper<Fields>().eq(Fields::getFlagEnable, 1).eq(Fields::getStatus, 1));
     }
 
+    /**
+     * @author Ryan
+     * @description 鑾峰彇缁勭洏鏄庣粏
+     * @param
+     * @return
+     * @time 2025/4/7 16:58
+     */
     @Override
     public R getDeltByCode(String code) {
-        return R.ok(warehouseAreasItemService.getOne(new LambdaQueryWrapper<WarehouseAreasItem>().eq(WarehouseAreasItem::getTrackCode, code)));
+        //TODO 鍚庣画闇�鏍规嵁绛栫暐閰嶇疆锛岃幏鍙栫粍鎷栨暟鎹�傚锛氭贩瑁咃紝鎸夋壒娆℃贩瑁呯瓑
+        LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new QueryWrapper<WarehouseAreasItem>()
+                .select("SUM(anfme) as anfme, track_code, asn_code, id, splr_batch, ispt_result, plat_item_id, batch, qty, work_qty, matnr_code, matnr_id, maktx").lambda()
+                .eq(WarehouseAreasItem::getTrackCode, code)
+                .groupBy(WarehouseAreasItem::getSplrBatch, WarehouseAreasItem::getAsnId, WarehouseAreasItem::getAreaId);
+        return R.ok(warehouseAreasItemService.getOne(queryWrapper));
+//        return R.ok(warehouseAreasItemService.list(new LambdaQueryWrapper<WarehouseAreasItem>()
+//                        .select(WarehouseAreasItem::getId, WarehouseAreasItem::getAsnCode, WarehouseAreasItem::getAsnId, WarehouseAreasItem::getSplrBatch,
+//                                WarehouseAreasItem::getIsptResult, WarehouseAreasItem::getPlatItemId, WarehouseAreasItem::getQty, WarehouseAreasItem::getWorkQty,
+//                                WarehouseAreasItem::getMatnrCode, WarehouseAreasItem::getMatnrId)
+//                .eq(WarehouseAreasItem::getTrackCode, code)
+//                .groupBy(WarehouseAreasItem::getSplrBatch, WarehouseAreasItem::getAsnId, WarehouseAreasItem::getAreaId)
+//        ));
     }
 
     /**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java
index a152659..176d8a1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java
@@ -53,6 +53,19 @@
     @ApiModelProperty("鍗曟嵁鏄庣粏ID")
     private Long asnItemId;
 
+    @ApiModelProperty("琛屽彿")
+    private String platItemId;
+
+    @ApiModelProperty("璐ㄦ缁撴灉")
+    private Short isptResult;
+
+    @ApiModelProperty("宸叉敹璐ф暟閲�")
+    private Double qty;
+
+    @ApiModelProperty("鎵ц鏁伴噺")
+    private Double workQty;
+
+
     /**
      * 鍖哄煙鍚嶇О
      */
@@ -72,7 +85,7 @@
      * 鐗╂枡鍚嶇О
      */
     @ApiModelProperty(value= "鐗╂枡鍚嶇О")
-    private String matnrName;
+    private String maktx;
 
     /**
      * 鐗╂枡缂栫爜
@@ -207,7 +220,7 @@
         this.areaId = areaId;
         this.areaName = areaName;
         this.matnrId = matnrId;
-        this.matnrName = matnrName;
+        this.maktx = matnrName;
         this.matnrCode = matnrCode;
         this.trackCode = trackCode;
         this.anfme = anfme;

--
Gitblit v1.9.1