From b3a492710afef8731d7f367247a9c811faa648ae Mon Sep 17 00:00:00 2001
From: lishihai <dslsh@dscom>
Date: 星期三, 03 七月 2024 17:57:16 +0800
Subject: [PATCH] 导入物料/产品->新模版多单位计量单位转换BUG修复
---
service/material.go | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/service/material.go b/service/material.go
index f4f302c..c9d1536 100644
--- a/service/material.go
+++ b/service/material.go
@@ -98,17 +98,14 @@
return 0, errors.New(errMsg)
}
material.CategoryId = mapProductCategory[strings.Trim(insert[3], " ")]
- if len(insert) > 5 && insert[4] != "" {
- //errMsg = "绗�" + strconv.Itoa(index+1) + "琛岋紝浜у搧缂栫爜锛�" + insert[0] + "锛屾湭濉啓鍗曚綅"
- //return 0, errors.New(errMsg)
- material.Unit = insert[4]
- }
+
+ material.Unit = insert[4]
var moreUnit = true
if len(insert) > 6 && insert[5] != "" {
material.MoreUnit = &moreUnit
var ut models.UnitItems
- ut.Unit = insert[4]
+ ut.Unit = insert[5]
if len(insert) < 13 || insert[12] == "" {
errMsg = "绗�" + strconv.Itoa(index+2) + "琛岋紝浜у搧缂栫爜锛�" + insert[0] + "锛岃濉啓涓庤緟璁￠噺鍗曚綅1鐩稿叧鐨勫崟浣嶆崲绠楁瘮渚�1"
return 0, errors.New(errMsg)
@@ -128,7 +125,7 @@
if len(insert) > 7 && insert[6] != "" {
material.MoreUnit = &moreUnit
var ut models.UnitItems
- ut.Unit = insert[5]
+ ut.Unit = insert[6]
if len(insert) < 15 || insert[14] == "" {
errMsg = "绗�" + strconv.Itoa(index+2) + "琛岋紝浜у搧缂栫爜锛�" + insert[0] + "锛岃濉啓涓庤緟璁￠噺鍗曚綅2鐩稿叧鐨勫崟浣嶆崲绠楁瘮渚�2"
return 0, errors.New(errMsg)
--
Gitblit v1.8.0