From 391e56cca8fc835791358ff32e63b1da6574462d Mon Sep 17 00:00:00 2001
From: Ryan <creaycat@gmail.com>
Date: 星期四, 03 四月 2025 20:26:31 +0800
Subject: [PATCH] no message

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java |   58 +++++++++++++++++++++++++++++++---------------------------
 1 files changed, 31 insertions(+), 27 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 770b726..df57841 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
@@ -242,7 +242,36 @@
 //            }
             Double itemRcptQty = dto.getReceiptQty() + orderItem.getQty();
             orderItem.setQty(itemRcptQty)
+                    .setSplrBatch(dto.getSplrBatch())
+                    .setStockUnit(dto.getStockUnit())
                     .setProdTime(dto.getProdTime());
+
+            if (!Objects.isNull(fields)) {
+                if (!Objects.isNull(dto.getExtendFields())) {
+                    //鑾峰彇16浣島uid
+                    String uuid16 = CommonUtil.randomUUID16();
+                    Map<String, Object> extendFields = dto.getExtendFields();
+                    //瀛楁闆嗗悎鐢虫槑
+                    List<FieldsItem> fieldsItems = new ArrayList<>();
+                    extendFields.keySet().forEach(key -> {
+                        fields.forEach(obj -> {
+                            //鍒ゆ柇key鍊间笌fields琛ㄥ瓧娈垫槸鍚︾浉鍚�
+                            if (obj.getFields().equals(key)) {
+                                FieldsItem fieldsItem = new FieldsItem();
+                                fieldsItem.setMatnrId(matnr.getId()).setFieldsId(obj.getId())
+                                        .setShiperId(matnr.getShipperId())
+                                        .setValue(extendFields.get(key).toString())
+                                        .setUuid(uuid16);
+                                fieldsItems.add(fieldsItem);
+                            }
+                        });
+                    });
+                    if (!fieldsItemService.saveBatch(fieldsItems)) {
+                        throw new CoolException("鎵╁睍瀛楁淇濆瓨澶辫触锛侊紒");
+                    }
+                    orderItem.setFieldsIndex(uuid16);
+                }
+            }
 
             if (asnOrderItemMapper.updateById(orderItem) < 1) {
                 throw new CoolException("閫氱煡鍗曟槑缁嗘暟閲忎慨鏀瑰け璐ワ紒锛�");
@@ -270,36 +299,11 @@
                     .setUnit(dto.getStockUnit())
                     .setStockUnit(dto.getStockUnit())
                     .setWeight(matnr.getWeight())
+                    .setFieldsIndex(orderItem.getFieldsIndex())
                     .setShipperId(matnr.getShipperId());
                     //TODO 渚涘簲鍟嗘爣璇嗘湭璁剧疆锛屾爣璇嗙敱PO鍗曚緵搴斿晢缂栫爜杞崲
 
-            if (!Objects.isNull(fields)) {
-                if (!Objects.isNull(dto.getExtendFields())) {
-                    //鑾峰彇16浣島uid
-                    String uuid16 = CommonUtil.randomUUID16();
-                    Map<String, Object> extendFields = dto.getExtendFields();
-                    //瀛楁闆嗗悎鐢虫槑
-                    List<FieldsItem> fieldsItems = new ArrayList<>();
-                    extendFields.keySet().forEach(key -> {
-                        fields.forEach(obj -> {
-                            //鍒ゆ柇key鍊间笌fields琛ㄥ瓧娈垫槸鍚︾浉鍚�
-                            if (obj.getFields().equals(key)) {
-                                FieldsItem fieldsItem = new FieldsItem();
-                                fieldsItem.setMatnrId(matnr.getId()).setFieldsId(obj.getId())
-                                        .setShiperId(matnr.getShipperId())
-                                        .setValue(extendFields.get(key).toString())
-                                        .setUuid(uuid16);
-                                fieldsItems.add(fieldsItem);
-                                //鍞竴鏍囪瘑鍏ュ簱
-                                item.setFieldsIndex(uuid16);
-                            }
-                        });
-                    });
-                    if (!fieldsItemService.saveBatch(fieldsItems)) {
-                        throw new CoolException("鎵╁睍瀛楁淇濆瓨澶辫触锛侊紒");
-                    }
-                }
-            }
+
             allOrders.add(item);
         });
 

--
Gitblit v1.9.1