From e72f4946b1696a570022d6ae715fa07656ab89f7 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 27 九月 2023 13:07:43 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index cbb903c..9a03e7f 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -800,13 +800,16 @@
         //od.setAnfme(toString(odParam.get("iQuantity")));
         //琛屽彿
         //od.setBrand(odParam.get("irowno").toString());
-        od.setBrand(toString(odParam.get("irowno")));
+        //od.setBrand(toString(odParam.get("irowno")));
+        od.setManu(toString(odParam.get("irowno")));
         //閿�鍞鍗曞彿
         //od.setColor(odParam.get("csocode").toString());
-        od.setColor(toString(odParam.get("csocode")));
+        //od.setColor(toString(odParam.get("csocode")));
+        od.setThreeCode(toString(odParam.get("csocode")));
         //閿�鍞鍗曡鍙�
         //od.setOrigin(odParam.get("isoseq").toString());
-        od.setOrigin(toString(odParam.get("isoseq")));
+        //od.setOrigin(toString(odParam.get("isoseq")));
+        od.setDeadTime(toString(odParam.get("isoseq")));
 
         od.setStatus(1);
         od.setQty(0.0D);

--
Gitblit v1.9.1