From cc4769108b9b98fabf48a91033c8df90a396e061 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 14 十一月 2025 10:48:37 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/entity/param/OrderMesXGHYParam.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/param/OrderMesXGHYParam.java b/src/main/java/com/zy/asrs/entity/param/OrderMesXGHYParam.java
index 272613f..b1623fb 100644
--- a/src/main/java/com/zy/asrs/entity/param/OrderMesXGHYParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OrderMesXGHYParam.java
@@ -1,5 +1,6 @@
 package com.zy.asrs.entity.param;
 
+import com.core.common.Cools;
 import com.core.common.DateUtils;
 import com.zy.asrs.entity.LocDetl;
 import com.zy.asrs.entity.WrkDetl;
@@ -70,10 +71,10 @@
                 this.boxNo = sampleWrkDetl.getBatch();
                 this.rollNo = sampleWrkDetl.getModel();
                 this.specs = sampleWrkDetl.getMatnr();
-                this.length = sampleWrkDetl.getPrice().toString();
+                this.length = Cools.isEmpty(sampleWrkDetl.getPrice())? "0" : sampleWrkDetl.getPrice().toString();
                 this.splices = sampleWrkDetl.getSpecs();
-                this.netWeight = sampleWrkDetl.getWeight().toString();
-                this.grossWeight = sampleWrkDetl.getVolume().toString();
+                this.netWeight = Cools.isEmpty(sampleWrkDetl.getWeight())? "0" : sampleWrkDetl.getWeight().toString();
+                this.grossWeight = Cools.isEmpty(sampleWrkDetl.getVolume())? "0" : sampleWrkDetl.getVolume().toString();
                 this.orderSerialNumber = sampleWrkDetl.getOrderNo();
             }
 
@@ -81,10 +82,10 @@
                 this.boxNo = sampleLocDetl.getBatch();
                 this.rollNo = sampleLocDetl.getModel();
                 this.specs = sampleLocDetl.getMatnr();
-                this.length = sampleLocDetl.getPrice().toString();
+                this.length = Cools.isEmpty(sampleLocDetl.getPrice())? "0" : sampleLocDetl.getPrice().toString();
                 this.splices = sampleLocDetl.getSpecs();
-                this.netWeight = sampleLocDetl.getWeight().toString();
-                this.grossWeight = sampleLocDetl.getVolume().toString();
+                this.netWeight = Cools.isEmpty(sampleLocDetl.getWeight())? "0" : sampleLocDetl.getWeight().toString();
+                this.grossWeight = Cools.isEmpty(sampleLocDetl.getVolume())? "0" : sampleLocDetl.getVolume().toString();
             }
 
             @Override
@@ -230,7 +231,6 @@
                 }
                 boxPos = sampleWrkDetl.getOrigin();
                 boxType = sampleWrkDetl.getBrand$();
-                stockType = sampleWrkDetl.getManu();
                 packageGroupNo = sampleWrkDetl.getDeadTime();
                 OrderMesXGHYParam.Box.Roll roll = new OrderMesXGHYParam.Box.Roll(sampleWrkDetl);
 

--
Gitblit v1.9.1