瀏覽代碼

当"床垫清单还没匹配L1成品"时,自动保存L1成品

shuiping150 2 月之前
父節點
當前提交
7e928d0d69
共有 3 個文件被更改,包括 62 次插入12 次删除
  1. 18 0
      JLHHJSvr/Com/Model/u_mattress.cs
  2. 12 12
      JLHHJSvr/Excutor/CreatMtrlPfExcutor.cs
  3. 32 0
      JLHHJSvr/Helper/ERPHelper.cs

+ 18 - 0
JLHHJSvr/Com/Model/u_mattress.cs

@@ -62,12 +62,30 @@ namespace JLHHJSvr.Com.Model
         public int? if_discount { get; set; }
         public int? erp_mtrlid { get; set; }
         public int? erp_configcodetype { get; set; }
+        /// <summary>
+        /// 编码
+        /// </summary>
         public string erp_mtrlcode { get; set; }
+        /// <summary>
+        /// 名称
+        /// </summary>
         public string erp_mtrlname { get; set; }
+        /// <summary>
+        /// 规格
+        /// </summary>
         public string erp_mtrlmode { get; set; }
         public int? erp_mtrltypeid { get; set; }
+        /// <summary>
+        /// 类别
+        /// </summary>
         public string erp_mtrltype { get; set; }
+        /// <summary>
+        /// 单位
+        /// </summary>
         public string erp_mtrlunit { get; set; }
+        /// <summary>
+        /// 英文名
+        /// </summary>
         public string erp_mtrlengname { get; set; }
         public string erp_piccode { get; set; }
         public int? yw_flag { get; set; }

+ 12 - 12
JLHHJSvr/Excutor/CreatMtrlPfExcutor.cs

@@ -1,16 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Data.SqlClient;
-using System.Linq;
-using System.Text;
-using DirectService.Tools;
 using JLHHJSvr.BLL;
 using JLHHJSvr.Com;
 using JLHHJSvr.Com.Model;
 using JLHHJSvr.Helper;
-using JLHHJSvr.LJException;
-using JLHHJSvr.LJFramework.Tools;
-using JLHHJSvr.Tools;
 using LJLib.DAL.SQL;
 using LJLib.Net.SPI.Server;
 using Newtonsoft.Json.Linq;
@@ -46,10 +40,20 @@ namespace JLHHJSvr.Excutor
                     rslt.ErrMsg = "床垫报价单匹配失败";
                     return;
                 }
+
+                var l1Helper = HelperBase.GetHelper<ERPHelper>(cmd);
+                l1Helper.context = new HelperBase.Context() { tokendata = tokendata };
+
+                l1Helper.CheckLogin();
+
                 if (mattress.erp_mtrlid <= 0)
                 {
-                    rslt.ErrMsg = "床垫清单还没匹配L1成品";
-                    return;
+                    var errMsg = l1Helper.SaveMtrldef(mattress);
+                    if (!string.IsNullOrEmpty(errMsg))
+                    {
+                        rslt.ErrMsg = errMsg;
+                        return;
+                    }
                 }
 
                 var mattress_interface_qd_list = new List<u_mattress_interface_qd>();
@@ -145,10 +149,6 @@ namespace JLHHJSvr.Excutor
                     i++;
                 }
 
-                var l1Helper = HelperBase.GetHelper<ERPHelper>(cmd);
-                l1Helper.context = new HelperBase.Context() { tokendata = tokendata };
-                
-                l1Helper.CheckLogin();
                 l1Req.token = GlobalVar.ERP_TOKEN;
 
                 var l1Rslt = l1Helper.DoExecute("SavePrdPf", JObject.FromObject(l1Req));

+ 32 - 0
JLHHJSvr/Helper/ERPHelper.cs

@@ -126,5 +126,37 @@ namespace JLHHJSvr.Helper
             const string expiredFlag = "已与服务器失联";
             return ex.Message.Contains(expiredFlag);
         }
+        /// <summary>
+        /// 保存物料资料
+        /// </summary>
+        /// <param name="mtrl">核价物料资料</param>
+        /// <returns>错误信息</returns>
+        public string SaveMtrldef(u_mattress mtrl)
+        {
+            var errMsg = string.Empty;
+
+            var l1Req = new JObject()
+            {
+                ["mtrls"] = new JArray
+                {
+                    new JObject()
+                    {
+                        ["mtrlcode"] = mtrl.erp_mtrlcode,
+                        ["mtrlname"] = mtrl.erp_mtrlname,
+                        ["mtrlmode"] = mtrl.erp_mtrlmode,
+                        ["mtrltypeid"] = mtrl.erp_mtrltypeid,
+                        ["mtrltype"] = mtrl.erp_mtrltype,
+                        ["unit"] = mtrl.erp_mtrlunit,
+                        ["mtrlengname"] = mtrl.erp_mtrlengname
+                    }
+                },
+                ["updateFields"] = "mtrlcode,mtrlname,mtrlmode,mtrltypeid,mtrltype,unit,mtrlengname"
+            };
+
+            var l1Rslt = DoExecute("SavePrdPf", JObject.FromObject(l1Req));
+            errMsg = $"{l1Rslt.GetValue("ErrMsg")}";
+
+            return errMsg;
+        }
     }
 }