2 Commits 646b45eb17 ... f9609eb242

Author SHA1 Message Date
  gkj f9609eb242 Merge branch '合金库' of http://120.77.11.229:3000/zuolinhao/WcsFramework into 合金库 2 years ago
  gkj 2416d1b1a7 fix 2 years ago
1 changed files with 17 additions and 6 deletions
  1. 17 6
      WCS.WorkEngineering/WebApi/Controllers/IwmsApi.cs

+ 17 - 6
WCS.WorkEngineering/WebApi/Controllers/IwmsApi.cs

@@ -43,16 +43,13 @@ namespace WCS.WorkEngineering.WebApi.Controllers
         /// <returns></returns>
         /// <returns></returns>
         public static zhongTianIntoStockResponse 满轮出库(string matCode, string wbCode, string taskNo, string rfid, string matNo, bool isSurplus, bool isRework, bool matFast, string gradeCode, string wetIntoBinCode)
         public static zhongTianIntoStockResponse 满轮出库(string matCode, string wbCode, string taskNo, string rfid, string matNo, bool isSurplus, bool isRework, bool matFast, string gradeCode, string wetIntoBinCode)
         {
         {
-            return zhongTianIntoStock(new zhongTianIntoStockRequest()
+            var zhongTian = new zhongTianIntoStockRequest()
             {
             {
                 matCode = matCode,
                 matCode = matCode,
                 wbCode = wbCode,
                 wbCode = wbCode,
                 inSpoolFull = "1",
                 inSpoolFull = "1",
                 getOutEmpty = false,
                 getOutEmpty = false,
-                wetInto = true,
-                wetIntoSpec = wetIntoBinCode.Length == 14 ? false : true,
                 wetIntoReturn = false,
                 wetIntoReturn = false,
-                wetSpecWbCode = "0",
                 isSurplus = isSurplus == false ? "0" : "1",
                 isSurplus = isSurplus == false ? "0" : "1",
                 isRework = isRework == false ? "0" : "1",
                 isRework = isRework == false ? "0" : "1",
                 spoolNo = rfid,
                 spoolNo = rfid,
@@ -63,8 +60,22 @@ namespace WCS.WorkEngineering.WebApi.Controllers
                 taskNo = $"RK{taskNo}",
                 taskNo = $"RK{taskNo}",
                 returnDesc = "",
                 returnDesc = "",
                 lockFlag = "0",
                 lockFlag = "0",
-                wetIntoBinCode = wetIntoBinCode
-            });
+            };
+            if (wetIntoBinCode.Length == 14)
+            {
+                zhongTian.wetInto = true;
+                zhongTian.wetIntoBinCode = wetIntoBinCode;
+                zhongTian.wetIntoSpec = false;
+                zhongTian.wetSpecWbCode = "";
+            }
+            else
+            {
+                zhongTian.wetInto = false;
+                zhongTian.wetIntoBinCode = "";
+                zhongTian.wetIntoSpec = true;
+                zhongTian.wetSpecWbCode = wetIntoBinCode;
+            }
+            return zhongTianIntoStock(zhongTian);
             //return zhongTianOutStock(new zhongTianOutStockRequest()
             //return zhongTianOutStock(new zhongTianOutStockRequest()
             //{
             //{
             //    matCode = matCode,
             //    matCode = matCode,