From d5c33d641cc7df16e7a6270df7095025a55e275d Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期六, 29 三月 2025 12:49:50 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java                 |   10 +++
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java       |   18 +++++
 rsf-server/src/main/java/com/vincent/rsf/server/system/constant/SerialRuleCode.java               |    5 +
 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java              |   10 +-
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java    |    8 ++
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java           |   12 ++-
 rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java                           |    2 
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java                  |    5 +
 rsf-server/src/main/java/com/vincent/rsf/server/system/utils/ExtendFieldsUtils.java               |    2 
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java |   15 ++++-
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java                 |    2 
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java     |   12 +--
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderLog.java                   |    3 +
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java                      |   31 ++++++++++
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItemLog.java               |    6 ++
 rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java               |    3 +
 16 files changed, 117 insertions(+), 27 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java
index 320bcdc..4495118 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java
@@ -56,17 +56,17 @@
 
     /**
      * 鏍囧噯鎵爜鏀惰揣淇℃伅
-     * @param barcode
+     * @param trackCode
      * @return
      */
     @PreAuthorize("hasAuthority('manager:asnOrder:list')")
-    @GetMapping("/orders/{barcode}")
+    @GetMapping("/orders/{trackCode}")
     @ApiOperation("鏍囧噯鎵爜鏀惰揣")
-    public R  getOrderBybarcode(@PathVariable String barcode) {
-        if (StringUtils.isEmpty(barcode)) {
+    public R  getOrderBybarcode(@PathVariable String trackCode) {
+        if (StringUtils.isEmpty(trackCode)) {
             throw new CoolException("鏉$爜涓嶈兘涓虹┖锛侊紒");
         }
-        return mobileService.getOrderByCode(barcode);
+        return mobileService.getOrderByCode(trackCode);
     }
 
     /**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java
index a7174c7..67b0970 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java
@@ -61,6 +61,9 @@
     @ApiModelProperty("閲囪喘鏁伴噺")
     private Double purQty;
 
+    @ApiModelProperty("瀹為檯閫佽揣鏁伴噺")
+    private Double anfme;
+
     @ApiModelProperty("鏀惰揣鏁伴噺")
     private Double receiptQty;
 
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 a00a0ec..536d759 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
@@ -1,6 +1,5 @@
 package com.vincent.rsf.server.api.service.impl;
 
-import com.alibaba.druid.sql.visitor.functions.If;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.vincent.rsf.framework.common.Cools;
 import com.vincent.rsf.framework.common.R;
@@ -142,7 +141,7 @@
         if (StringUtils.isEmpty(barcode)) {
             return R.error("鏍囩鐮佷笉鑳戒负绌猴紒锛�");
         }
-        List<AsnOrderItem> asnOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getBarcode, barcode));
+        List<AsnOrderItem> asnOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getTrackCode, barcode));
         if (Objects.isNull(asnOrderItem)) {
             throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
         }
@@ -166,7 +165,6 @@
         if (Objects.isNull(params.getWhAreaId())) {
             throw new CoolException("搴撳尯鏍囪瘑涓嶈兘涓虹┖锛侊紒");
         }
-
 
         WarehouseAreas areasItem = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>().eq(WarehouseAreas::getId, params.getWhAreaId()));
         if (Objects.isNull(areasItem)) {
@@ -200,7 +198,7 @@
             if (Objects.isNull(dto.getReceiptQty())) {
                 throw new CoolException("鏀惰揣鏁版嵁涓嶈兘涓虹┖锛侊紒");
             }
-            if (dto.getReceiptQty() < dto.getPurQty()) {
+            if (dto.getReceiptQty().compareTo(dto.getAnfme()) > 0) {
                 throw new CoolException("鏀惰揣鏁伴噺涓嶈兘澶т簬閲囪喘鏁伴噺锛侊紒");
             }
 
@@ -296,6 +294,7 @@
 
         AsnOrderLog orderLog = new AsnOrderLog();
         BeanUtils.copyProperties(asnOrder, orderLog);
+        orderLog.setAsnId(asnOrder.getId());
 
         if (!asnOrderLogService.save(orderLog)) {
             throw new CoolException("涓诲崟鍘嗗彶妗f坊鍔犲け璐ワ紒锛�");
@@ -306,6 +305,8 @@
         items.forEach(item -> {
             AsnOrderItemLog itemLog = new AsnOrderItemLog();
             BeanUtils.copyProperties(item, itemLog);
+            itemLog.setAsnItemId(itemLog.getId())
+                    .setAsnId(item.getAsnId());
             logs.add(itemLog);
         });
 
@@ -389,7 +390,8 @@
                     .setMaktx(asnOrderItem.getMaktx())
                     .setBarcode(asnOrderItem.getBarcode())
                     .setPoCode(asnOrderItem.getPoCode())
-                    .setPurQty(asnOrderItem.getAnfme())
+                    .setAnfme(asnOrderItem.getAnfme())
+                    .setPurQty(asnOrderItem.getPurQty())
                     .setSplrBatch(asnOrderItem.getSplrBatch());
 
             Matnr matnr = matnrMapper.selectById(asnOrderItem.getMatnrId());
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
index da01e74..08b5f70 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
@@ -22,7 +22,7 @@
 //        generator.username="sa";
 //        generator.password="Zoneyung@zy56$";
 
-        generator.table="man_wait_pakin_item";
+        generator.table="man_asn_order_log";
         generator.tableDesc="缁勬嫋妗f槑缁�";
         generator.packagePath="com.vincent.rsf.server.manager";
 
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
index 0769ded..385b535 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
@@ -114,7 +114,7 @@
 
 
     @PreAuthorize("hasAuthority('manager:waitPakin:update')")
-    @ApiOperation("缁勭洏")
+    @ApiOperation("缁勬嫋")
     @PostMapping("/waitPakin/merge")
     public R pikinOrder(@RequestBody WaitPakinParam waitPakin) {
         if (Objects.isNull(waitPakin)) {
@@ -129,5 +129,21 @@
         return R.ok(waitPakinService.mergeItems(waitPakin));
     }
 
+    @PreAuthorize("hasAuthority('manager:waitPakin:update')")
+    @ApiOperation("缁勬嫋瑙g粦")
+    @PostMapping("/waitPakin/unbind")
+    public R pakinUnBind(@RequestBody WaitPakinParam param) {
+        if (Objects.isNull(param)) {
+            return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
+        if (StringUtils.isBlank(param.getBarcode())) {
+            return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+        }
+        if (Objects.isNull(param.getItems()) || param.getItems().isEmpty()) {
+            return R.error("璺熻釜鐮佷笉鑳戒负绌猴紒锛�");
+        }
+        return R.ok(waitPakinService);
+
+    }
 
 }
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
index bdf5076..0d1c981 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
@@ -1,8 +1,12 @@
 package com.vincent.rsf.server.manager.entity;
 
 import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.*;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.vincent.rsf.server.system.constant.DictTypeCode;
+import com.vincent.rsf.server.system.entity.DictData;
+import com.vincent.rsf.server.system.service.DictDataService;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 import com.baomidou.mybatisplus.annotation.TableLogic;
@@ -208,6 +212,31 @@
 //            null    // 澶囨敞
 //    );
 
+    public String getType$(){
+        if (Cools.isEmpty(this.type)){
+            return "";
+        }
+        DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+        DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_ORDER_TYPE).eq(DictData::getValue, this.type));
+        if (Objects.isNull(dictData)) {
+            return null;
+        }
+        return dictData.getLabel();
+    }
+
+    public String getWkType$(){
+        if (Cools.isEmpty(this.wkType)){
+            return "";
+        }
+        DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+        DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_BUSINESS_TYPE).eq(DictData::getValue, this.wkType));
+        if (Objects.isNull(dictData)) {
+            return null;
+        }
+        return dictData.getLabel();
+    }
+
+
     public String getArrTime$(){
         if (Cools.isEmpty(this.arrTime)){
             return "";
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
index 4de9ef0..ff094e5 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
@@ -120,6 +120,11 @@
     private Double purQty;
 
     /**
+     * 搴撳瓨鎵规
+     */
+    @ApiModelProperty("搴撳瓨鎵规")
+    private String batch;
+    /**
      * 閲囪喘鍗曚綅
      */
     @ApiModelProperty(value= "閲囪喘鍗曚綅")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItemLog.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItemLog.java
index 43a0aac..6522439 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItemLog.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItemLog.java
@@ -3,6 +3,8 @@
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+
+import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -22,6 +24,7 @@
 import java.util.Date;
 
 @Data
+@Accessors(chain = true)
 @TableName("man_asn_order_item_log")
 public class AsnOrderItemLog implements Serializable {
 
@@ -34,6 +37,9 @@
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+
+    @ApiModelProperty("Item ID")
+    private Long asnItemId;
     /**
      * ASN涓诲崟鏍囪瘑
      */
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderLog.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderLog.java
index 467026c..59d39db 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderLog.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderLog.java
@@ -36,6 +36,9 @@
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    @ApiModelProperty("涓诲崟ID")
+    private Long asnId;
+
     /**
      * 缂栧彿
      */
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java
index 27ec6bc..8b8a3d3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java
@@ -47,7 +47,7 @@
      * 璁㈠崟ID
      */
     @ApiModelProperty(value= "璁㈠崟ID")
-    private Long ansId;
+    private Long asnId;
 
     /**
      * 璁㈠崟缂栫爜
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
index 917d504..9d468c4 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
@@ -103,15 +103,24 @@
 
     @Override
     public boolean fieldsSave(Map<String, Object> params) {
-       //淇濆瓨鎵╁睍瀛楁
-        ExtendFieldsUtils.saveFields(params);
         AsnOrderItem asnOrderItem = JSONObject.parseObject(JSONObject.toJSONString(params), AsnOrderItem.class);
         if (StringUtils.isBlank(asnOrderItem.getTrackCode())) {
-            SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, params);
+            String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, asnOrderItem);
+            asnOrderItem.setTrackCode(ruleCode);
+        }
+        if (StringUtils.isBlank(asnOrderItem.getBatch())) {
+            String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_STOCK_BATCH_CODE, asnOrderItem);
+            asnOrderItem.setBatch(ruleCode);
         }
         if (!this.saveOrUpdate(asnOrderItem)) {
             throw new CoolException("鏀惰揣閫氱煡鍗曟槑缁嗕繚瀛樺け璐ワ紒锛�");
         }
+        //淇濆瓨鎵╁睍瀛楁
+        try {
+            ExtendFieldsUtils.saveFields(params);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
         return true;
     }
 
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
index ca6d9a9..1e7709d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
@@ -44,10 +44,8 @@
     private ReportMsgService reportMsgService;
     @Resource
     private PurchaseMapper purchaseMapper;
-
     @Autowired
     private AsnOrderItemService asnOrderItemService;
-
     @Resource
     private SerialRuleMapper serialRuleMapper;
 
@@ -67,7 +65,6 @@
             return false;
         }
     }
-
 
     @Override
     public List<AsnOrder> getListByMatnr(Map<String, String> params) {
@@ -92,7 +89,9 @@
             throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖");
         }
         AsnOrder orders = params.getOrders();
-
+        if (Objects.isNull(orders)) {
+            throw new CoolException("鍗曟嵁涓嶈兘涓虹┖锛侊紒");
+        }
         String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, orders);
         if (Objects.isNull(ruleCode)) {
             throw new CoolException("鏀惰揣閫氱煡鍗曠紪鐮佺敓鎴愬け璐ワ紒锛�");
@@ -111,7 +110,6 @@
             if (!asnOrderItemService.fieldsSave(item)) {
                 throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
             }
-
         });
         return R.ok("淇濆瓨鎴愬姛!!");
     }
@@ -130,7 +128,7 @@
         if (Objects.isNull(params.getOrders().getId())) {
             throw new CoolException("鏁版嵁閿欒锛氬崟鎹甀D涓嶈兘涓虹┖锛侊紒");
         }
-        if (this.updateById(params.getOrders())) {
+        if (!this.updateById(params.getOrders())) {
             throw new CoolException("涓诲崟淇敼澶辫触锛侊紒");
         }
         if (Objects.isNull(params.getItems()) || params.getItems().isEmpty()) {
@@ -138,7 +136,7 @@
         }
         List<Map<String, Object>> items = params.getItems();
         List<AsnOrderItem> asnOrderItems = JSONArray.parseArray(JSONArray.toJSONString(items), AsnOrderItem.class);
-        if (asnOrderItemService.saveOrUpdateBatch(asnOrderItems)) {
+        if (!asnOrderItemService.saveOrUpdateBatch(asnOrderItems)) {
             throw new CoolException("鏄庣粏淇敼澶辫触锛侊紒");
         }
         return R.ok("淇敼瀹屾垚锛侊紒");
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
index dfbcfe7..adedc2c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
@@ -83,8 +83,12 @@
             WaitPakinItem pakinItem = new WaitPakinItem();
             pakinItem.setAnfme(item.getAnfme())
                     .setPakinId(pakin.getId())
-                    .setAnsId(item.getAsnId())
+                    .setAsnId(item.getAsnId())
                     .setAsnCode(item.getAsnCode())
+                    .setAsnItemId(item.getId())
+                    .setMatnrCode(item.getMatnrCode())
+                    .setBatch(item.getSplrBatch())
+                    .setUnit(item.getStockUnit())
                     .setBatch(item.getSplrBatch())
                     .setFieldsIndex(item.getFieldsIndex())
                     .setUnit(item.getStockUnit())
@@ -98,7 +102,7 @@
                             .setAnfme(waitPakinItem.getQty())
                             .setTrackCode(waitPakinItem.getTrackCode());
                     /**鏇存柊鍗曟嵁鎵ц涓簱瀛�*/
-                    if (v.compareTo(item.getQty()) > 0) {throw new CoolException("鎵ц涓暟閲忓ぇ浜庢敹璐ф暟閲忥紒锛�");}
+                    if (v.compareTo(item.getAnfme()) > 0) {throw new CoolException("鎵ц涓暟閲忓ぇ浜庢敹璐ф暟閲忥紒锛�");}
                     if (!asnOrderItemService.update(new LambdaUpdateWrapper<AsnOrderItem>()
                             .eq(AsnOrderItem::getTrackCode, waitPakinItem.getTrackCode()).set(AsnOrderItem::getWorkQty, v))) {
                         throw new CoolException("鎵ц涓簱瀛樻洿鏂板け璐ワ紒锛�");
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java
index 00d56d1..e9992e7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java
@@ -24,4 +24,14 @@
      */
     public final static String DICT_SYS_DEVICE_TYPE = "sys_device_type";
 
+    /**
+     * 鍗曟嵁涓氬姟绫诲瀷
+     */
+    public final static String DICT_SYS_BUSINESS_TYPE = "sys_business_type";
+
+    /**
+     * 鍗曟嵁绫诲瀷
+     */
+    public final static String DICT_SYS_ORDER_TYPE = "sys_order_type";
+
 }
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/SerialRuleCode.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/SerialRuleCode.java
index 98c6e4e..12e3852 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/SerialRuleCode.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/SerialRuleCode.java
@@ -44,4 +44,9 @@
      */
     public final static String SYS_WAIT_PAKIN_CODE = "sys_wait_pakin_code";
 
+    /**
+     * 搴撳瓨鎵规缂栫爜瑙勫垯
+     */
+    public final static String SYS_STOCK_BATCH_CODE = "sys_stock_batch_code";
+
 }
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/ExtendFieldsUtils.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/ExtendFieldsUtils.java
index 8972eff..0ff555f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/ExtendFieldsUtils.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/ExtendFieldsUtils.java
@@ -28,7 +28,7 @@
      * @return
      * @time 2025/3/15 13:36
      */
-    public static Boolean saveFields(Map<String, Object> params) {
+    public static Boolean saveFields(Map<String, Object> params) throws Exception{
         FieldsService fieldsService = SpringUtils.getBean(FieldsService.class);
         List<Fields> fields = fieldsService.list(new LambdaQueryWrapper<Fields>()
                 .eq(Fields::getStatus, 1)

--
Gitblit v1.9.1