From f801c043aea0e37ef6bf40c83a7dc8d11c7476ec Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 31 Dec 2024 13:26:12 +0800
Subject: [PATCH] md

---
 .../web/emis/EmisWarehouseInBatchController.java   |  3 +++
 .../impl/EmisWarehouseInBatchServiceImpl.java      | 14 ++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInBatchController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInBatchController.java
index f2a10f912..4ab8c3574 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInBatchController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInBatchController.java
@@ -106,6 +106,9 @@ public class EmisWarehouseInBatchController extends EmisBaseController
     public AjaxResult registerWarehouseInInfo(@RequestBody EmisWarehouseInBatch emisWarehouseInBatch)
     {
         try {
+
+            // 校验数据
+
             return toAjax(emisWarehouseInBatchService.insertEmisWarehouseInBatch(emisWarehouseInBatch));
         } catch (EmisBizError emisBizError) {
             emisBizError.printStackTrace();
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java
index 6e43c942b..21cb01960 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java
@@ -10,6 +10,7 @@
 
 package com.xdadan.erp.emis.service.impl;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -95,6 +96,19 @@ public class EmisWarehouseInBatchServiceImpl extends EmisBaseService implements
             throw new EmisBizError(EmisBizErrorType.FAIL,"进仓货物列表不能为空");
         }
 
+        // 重量必填
+        if(emisWarehouseInBatch.getBillWeight()==null || ( emisWarehouseInBatch.getBillWeight()!=null && emisWarehouseInBatch.getBillWeight().compareTo(BigDecimal.ZERO)==0 ) ){
+            throw new EmisBizError(EmisBizErrorType.FAIL,"包裹重量必填");
+        }
+
+        if(emisWarehouseInBatch.getTotalVolume()==null || (emisWarehouseInBatch.getTotalVolume()!=null && emisWarehouseInBatch.getTotalVolume().compareTo(BigDecimal.ZERO)==0 ) ){
+            throw new EmisBizError(EmisBizErrorType.FAIL,"总体积必填");
+        }
+
+        if(emisWarehouseInBatch.getParcelQty()==null || (emisWarehouseInBatch.getParcelQty()!=null && emisWarehouseInBatch.getParcelQty() <= 0 ) ){
+            throw new EmisBizError(EmisBizErrorType.FAIL,"总件数必填");
+        }
+
         // 进仓序列号,插入进仓批次
         String serialNo= WaybillHelper.genWsInSerialNo();
         emisWarehouseInBatch.setSerialNo(serialNo);