From 0b3cdb1e0c2f495edb971c585bd6b4b0456bf93a Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期二, 14 四月 2026 14:55:34 +0800
Subject: [PATCH] 字段变更 增加类型

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
index 5088b9b..cb3c483 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
@@ -207,8 +207,15 @@
             if (barcodeToUse == null && !existTasks.isEmpty()) {
                 barcodeToUse = existTasks.get(0).getBarcode();
                 if (StringUtils.isNotBlank(barcodeToUse)) {
-                    locService.update(new LambdaUpdateWrapper<Loc>().eq(Loc::getId, loc.getId())
-                            .set(Loc::getBarcode, barcodeToUse).set(Loc::getUpdateBy, loginUserId).set(Loc::getUpdateTime, new Date()));
+                    Task refTask = existTasks.get(0);
+                    LambdaUpdateWrapper<Loc> locUw = new LambdaUpdateWrapper<Loc>().eq(Loc::getId, loc.getId())
+                            .set(Loc::getBarcode, barcodeToUse)
+                            .set(Loc::getUpdateBy, loginUserId)
+                            .set(Loc::getUpdateTime, new Date());
+                    if (refTask.getWeight() != null) {
+                        locUw.set(Loc::getWeight, refTask.getWeight());
+                    }
+                    locService.update(locUw);
                 }
             }
             if (barcodeToUse == null) {
@@ -360,17 +367,17 @@
                         .setUpdateTime(new Date())
                         .setOrderType(OrderType.ORDER_OUT.type);
                 if (map.getType().equals(Constants.TASK_TYPE_ORDER_OUT_STOCK)) {
-                    taskItem.setWkType(Short.parseShort(order.getWkType()))
+                    taskItem.setWkType(order.getWkType())
                             .setSourceCode(order.getCode())
                             .setSourceId(order.getId())
                             .setOrderItemId(item.getOrderItemId());
                 } else if (map.getType().equals(Constants.TASK_TYPE_WAVE_OUT_STOCK)) {
                     taskItem.setSourceId(wave.getId())
-                            .setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_OTHER.type))
+                            .setWkType(OrderWorkType.ORDER_WORK_TYPE_OTHER.type)
                             .setSourceCode(wave.getCode())
                             .setSource(item.getSource());
                 } else if (map.getType().equals(Constants.TASK_TYPE_OUT_CHECK) || map.getType().equals(Constants.TASK_TYPE_OUT_STOCK)) {
-                    taskItem.setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.type))
+                    taskItem.setWkType(OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.type)
                             .setSource(item.getId())
                             .setSourceId(item.getLocId())
                             .setSourceCode(item.getLocCode());
@@ -456,7 +463,8 @@
             throw new CoolException("鐩爣搴撲綅涓嶅瓨鍦紒锛�");
         }
 
-        targetLoc.setUseStatus(LocStsType.LOC_STS_TYPE_S.type);
+        targetLoc.setUseStatus(LocStsType.LOC_STS_TYPE_S.type)
+                .setWeight(orgLoc.getWeight());
 
         if (!locService.updateById(targetLoc)) {
             throw new CoolException("鐩爣搴撲綅棰勭害澶辫触锛侊紒");
@@ -494,7 +502,7 @@
                         .setSource(item.getId())
                         .setUpdateTime(new Date())
                         .setOrderType(OrderType.ORDER_IN.type)
-                        .setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type));
+                        .setWkType(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type);
                 taskItems.add(taskItem);
             }
             if (!taskItemService.saveBatch(taskItems)) {

--
Gitblit v1.9.1