From cff1892e934a1ee233dd3fb32767b45aa613c2fb Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 11 四月 2023 10:29:38 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
index e51f6fc..cb0f9a4 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
@@ -415,6 +415,7 @@
ordrlist.HPinfan = dt.Rows[i]["HPinfan"].ToString();
ordrlist.HSourceName = dt.Rows[i]["鐢熶骇绾�"].ToString();
ordrlist.HEndDate = dt.Rows[i]["璁″垝瀹屽伐鏃ユ湡"].ToString();//鍗氭棩 鐢熶骇璁㈠崟 澶辨晥鏃ユ湡
+ ordrlist.HMinQty = dt.Rows[i]["鏈�灏忓寘瑁呮暟"].ToString();
if (HBarCodeType == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�")
{
ordrlist.HMinQty = dt.Rows[i]["鏈敓鎴愭潯鐮佹暟閲�"].ToString();
@@ -457,9 +458,12 @@
ordrlist.HRemark = dt.Rows[i]["澶囨敞"].ToString();
ordrlist.HMTONo = dt.Rows[i]["璁″垝璺熻釜鍙�"].ToString();
- ordrlist.HFurnaceNO = dt.Rows[i]["鐐夊彿"].ToString();
- ordrlist.HCoilNO = dt.Rows[i]["閽㈠嵎鎹嗗寘鍙�"].ToString();
- ordrlist.HheatNO = dt.Rows[i]["鐑鐞�"].ToString();
+ if(HSourceBillType == "鏀舵枡閫氱煡鍗�")
+ {
+ ordrlist.HFurnaceNO = dt.Rows[i]["鐐夊彿"].ToString();
+ ordrlist.HCoilNO = dt.Rows[i]["閽㈠嵎鎹嗗寘鍙�"].ToString();
+ ordrlist.HheatNO = dt.Rows[i]["鐑鐞�"].ToString();
+ }
if (HBarCodeType == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�")
{
--
Gitblit v1.9.1