From 16477681fa96cce4fac84b28c2ae81adb49b089d Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 18 三月 2024 12:41:28 +0800
Subject: [PATCH] 进站接收单、出站汇报单:报错问题解决

---
 DAL/车间管理/ClsSc_StationOutBill.cs |   14 +++++++++-----
 DAL/车间管理/ClsSc_StationInBill.cs  |    6 ++++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationInBill.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationInBill.cs"
index 1019c3e..51611a0 100644
--- "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationInBill.cs"
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationInBill.cs"
@@ -386,7 +386,9 @@
                     else
                     {
                         string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"Model\": { \"FID\":\"0\", \"FBILLNO\":\"" + Pub_Class.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBillNO"]) + "\", \"FStockOrgId\":{\"FNumber\":\"201\"},  " +
-                        "\"FPRDORGID\":{\"FNumber\":\"201\"}, \"FWORKSHOPID\":    {\"FNumber\":\"02.01\"},  \"FBillType\": {\"FNumber\":\"SCLLD01_SYS\"  " +
+                        "\"FPRDORGID\":{\"FNumber\":\"201\"}" +
+                        ", \"FWORKSHOPID\":    {\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["FWORKSHOPNUMBER"]) + "\"}" +
+                        ",  \"FBillType\": {\"FNumber\":\"SCLLD01_SYS\"  " +
                         " },  \"FEntity\": [  ";
 
                         string sJson_Entry = "";
@@ -420,7 +422,7 @@
                             "  \"FPPBOMBILLNO\" :  \"" + Pub_Class.ClsPub.isStrNull(ds2.Tables[0].Rows[i]["HPPBOMBILLNO"]) + "\" , " +
                             "  \"FPPBOMENTRYID\" : " + Pub_Class.ClsPub.isLong(ds2.Tables[0].Rows[i]["HPPBOMENTRYID"]) + " ,  " +
                             " \"FMATERIALID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(ds2.Tables[0].Rows[i]["HMATERNUMBER"]) + "\"} ,  " +
-                            "   \"FEntryWorkShopId\":    {\"FNumber\":\"02.01\"},   " +
+                            "   \"FEntryWorkShopId\":    {\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(ds2.Tables[0].Rows[i]["FWORKSHOPNUMBER"]) + "\"}," +
                             "  \"FSTOCKID\":    {\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(ds2.Tables[0].Rows[i]["HWHNumber"]) + "\"},    \"FAPPQTY\":" + Pub_Class.ClsPub.isDoule(ds2.Tables[0].Rows[i]["USEQTY"]) + ", " +
                             "  \"FACTUALQTY\":" + Pub_Class.ClsPub.isDoule(ds2.Tables[0].Rows[i]["USEQTY"]) + ", " +
                             " \"FSRCBILLTYPE\" : \"PRD_PPBOM\" ,  \"FSRCBILLNO\" :  \"" + Pub_Class.ClsPub.isStrNull(ds2.Tables[0].Rows[i]["HPPBOMBILLNO"]) + "\" , " +
diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationOutBill.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationOutBill.cs"
index 47cd322..436b68c 100644
--- "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationOutBill.cs"
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationOutBill.cs"
@@ -468,7 +468,9 @@
                             sJson_BatchNo = " ";
                         }
                         string sJson = "{\"Creator\":\"\",\"NeedUpDateFields\":[], \"IsEntryBatchFill\": \"True\", \"Model\": { \"FID\":\"0\", \"FBILLNO\":\"" + Pub_Class.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBillNO"]) + "\", \"FStockOrgId\":{\"FNumber\":\"201\"},  " +
-                        "\"FPRDORGID\":{\"FNumber\":\"201\"}, \"FWORKSHOPID\":    {\"FNumber\":\"02.01\"}, \"FOwnerId0\":{\"FNumber\":\"201\"}, \"FBillType\": {\"FNumber\":\"SCRKD02_SYS\" " +
+                        "\"FPRDORGID\":{\"FNumber\":\"201\"}" +
+                        ", \"FWORKSHOPID\":    {\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["FWORKSHOPNUMBER"]) + "\"}" +
+                        ", \"FOwnerId0\":{\"FNumber\":\"201\"}, \"FBillType\": {\"FNumber\":\"SCRKD02_SYS\" " +
                         " },  \"FEntity\": [   " +
                         " { " +
                         "  \"FIsNew\":false," +
@@ -482,8 +484,9 @@
                         " \"FSRCINTERID\" : " + Pub_Class.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HICMOInterID"]) + " , " +
                         " \"FSRCENTRYID\" : " + Pub_Class.ClsPub.isLong(ds2.Tables[0].Rows[0]["HICMOENtryID"]) + " ,  " +
                         " \"FSRCENTRYSEQ\" : " + Pub_Class.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HICMOSubID"]) + " , " +
-                        "  \"FMATERIALID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HMaterNumber"]) + "\"} ,  " +
-                        "  \"FWORKSHOPID1\":    {\"FNumber\":\"02.01\"},   \"FUNITID\":    {\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["FUNITID"]) + "\"},  \"FBASEUNITID\" :  {\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["FBASEUNITID"]) + "\"} , " +
+                        "  \"FMATERIALID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HMaterNumber"]) + "\"}   " +
+                        ", \"FWORKSHOPID1\":    {\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["FWORKSHOPNUMBER"]) + "\"}" +
+                        ",   \"FUNITID\":    {\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["FUNITID"]) + "\"},  \"FBASEUNITID\" :  {\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["FBASEUNITID"]) + "\"} , " +
                         "  \"FSTOCKID\":    {\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HWHNumber"]) + "\"}, \"FPRODUCTTYPE\" : 1  ,  " +
                         " \"FMUSTQty\":" + Pub_Class.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HQTY"]) + ", " +
                         "  \"FRealQty\":" + Pub_Class.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HQTY"]) + ",  " +
@@ -512,8 +515,9 @@
                         " \"FSRCINTERID\" : " + Pub_Class.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HICMOInterID"]) + " , " +
                         " \"FSRCENTRYID\" : " + Pub_Class.ClsPub.isLong(ds2.Tables[0].Rows[0]["HICMOENtryID"]) + " ,  " +
                         " \"FSRCENTRYSEQ\" : " + Pub_Class.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HICMOSubID"]) + " , " +
-                        "  \"FMATERIALID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HMaterNumber"]) + "\"} ,  " +
-                        "  \"FWORKSHOPID1\":    {\"FNumber\":\"02.01\"},   \"FUNITID\":    {\"FNumber\":\"009\"},  \"FBASEUNITID\" :  {\"FNumber\":\"Pcs\"} , " +
+                        "  \"FMATERIALID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HMaterNumber"]) + "\"}  " +
+                        ", \"FWORKSHOPID1\":    {\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["FWORKSHOPNUMBER"]) + "\"}" +
+                        ",   \"FUNITID\":    {\"FNumber\":\"009\"},  \"FBASEUNITID\" :  {\"FNumber\":\"Pcs\"} , " +
                         "  \"FSTOCKID\":    {\"FNumber\":\"009\"}, \"FPRODUCTTYPE\" : 1  ,  " +
                         " \"FMUSTQty\":" + omodel.HWasterQty.ToString() + ", " +
                         "  \"FRealQty\":" + omodel.HWasterQty.ToString() + ",  " +

--
Gitblit v1.9.1