核价：1、新增领用工组自动带出；2、半成品名称带出生产参数；

JLHHJSvr/Com/GetERPWrkGrpList.cs

@@ -25,6 +25,6 @@ namespace JLHHJSvr.Com
 
     public sealed class GetERPWrkGrpListResponse : LJResponse
     {
-        public List<erp_sc_workgroup> workgroupList { get; set; }
+        public List<u_sc_workgroup_erp> workgroupList { get; set; }
     }
 }

JLHHJSvr/Com/Model/u_bcpcompare.cs

@@ -11,6 +11,13 @@ namespace JLHHJSvr.Com.Model
     public sealed class u_bcpcompare
     {
         public string pzname { get; set; }
+        /// <summary>
+        /// 默认半成品归属
+        /// </summary>
         public string wip_type { get; set; }
+        /// <summary>
+        /// 默认领用工组L1
+        /// </summary>
+        public string wrkgrpcode2 { get; set; }
     }
 }

JLHHJSvr/Com/Model/u_sc_workgroup_erp.cs

@@ -0,0 +1,109 @@
+using LJLib.DAL.SQL;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace JLHHJSvr.Com.Model
+{
+    [PK(new[] { "wrkGrpid", "wrkgrpcode" })]
+    public sealed class u_sc_workgroup_erp
+    {
+        public int? wrkGrpid { get; set; }
+        public string wrkgrpcode { get; set; }
+        public string wrkGrpName { get; set; }
+        public byte? ifjj { get; set; }
+        public byte? ifprint { get; set; }
+        public string handtype { get; set; }
+        public byte? sonflag { get; set; }
+        public int? parentid { get; set; }
+        public byte? inuse { get; set; }
+        public int? storageid { get; set; }
+        public DateTime? opdate { get; set; }
+        public string opemp { get; set; }
+        public DateTime? moddate { get; set; }
+        public string modemp { get; set; }
+        public byte? ifwkpmtrlware { get; set; }
+        public string dscrp { get; set; }
+        public int? empnum { get; set; }
+        public decimal? avggz { get; set; }
+        /// <summary>
+        /// 工组进度生成模式
+        /// [0]按工组交接数统计
+        /// [1]按工组末工序计件确认数统计
+        /// [2]按末工序计件确认数更新工组完成数统计
+        /// [3]工序完工单（末工序）更新工组完工数
+        /// [4]工序完工单（末工序）更新工艺完工数以及工组完工数
+        /// [5]工艺完工单更新工组完工数
+        /// [6]部件条码更新工组完工数
+        /// [7]按工组质检单
+        /// [8]工序完工单（所有工序配套数）更新工组完工数
+        /// [9]工组配套完成数，按已完成的工价百分比更新
+        /// </summary>
+        public byte? jdtype { get; set; }
+        public int? jdnum { get; set; }
+        /// <summary>
+        /// 工组类型0-工组日历 1-工作中心日历
+        /// </summary>
+        public int? tasktype { get; set; }
+        public DateTime? sys_changetime { get; set; }
+        public decimal? userate { get; set; }
+        public int? deptid { get; set; }
+        public decimal? OTHour { get; set; }
+        public decimal? shortrate { get; set; }
+        public int? iflastfinish { get; set; }
+        public int? barcode_check { get; set; }
+        public byte? ifauto_mode { get; set; }
+        public byte? ifbj { get; set; }
+        public decimal? jjamt { get; set; }
+        /// <summary>
+        /// 0-派工单核实即完工；1-工位机接工方可完工；2-工组完工需要考虑下工组接收数
+        /// </summary>
+        public byte? finflowop { get; set; }
+        /// <summary>
+        /// 工组添加列 工位机工序派工流程选项 0-不限制工序派工 1-本工组配套接收才可派工
+        /// </summary>
+        public byte? proflowop { get; set; }
+        /// <summary>
+        /// 工位机小组质检分值录入方式[0-质检完工时录入][1-月尾批更新][2-先完工后评分]
+        /// </summary>
+        public byte? fenop { get; set; }
+
+        public int? gw_empid { get; set; }
+
+        public byte? ifkey { get; set; }
+        /// <summary>
+        /// 订单评审忽略产能
+        /// </summary>
+        public byte? SO_IgnoreCapacity { get; set; }
+        /// <summary>
+        /// 产能模式[0]工时 [1]工资 [2]套数 [3]工段折算套数 [-1]按工段属性
+        /// </summary>
+        public int? loadmode { get; set; }
+        public string simplename { get; set; }
+
+        /// <summary>
+        /// DONE:工位机工序交接主管代号,替代gw_empid的作用
+        /// </summary>
+        public string gw_mastercode { get; set; }
+        /// <summary>
+        /// TODO:本工组完成后是否需要交给后工组
+        /// </summary>
+        public byte? gw_ifprojj { get; set; }
+        /// <summary>
+        /// 是否允许派工后直接完工(0-不允许，1-允许)
+        /// </summary>
+        public int? ifdirectfinish { get; set; }
+        /// <summary>
+        /// 接报工模式：0：默认，手动接工，手动报工
+        /// </summary>
+        public int? acceptMode { get; set; }
+        /// <summary>
+        /// 完工模式：0，手动，1自动
+        /// </summary>
+        public int? finishMode { get; set; }
+
+        public int? piecemonthmode { get; set; }
+    }
+
+}

JLHHJSvr/Excutor/CreatPrdPfExcutor.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data.SqlClient;
+using System.Linq;
 using JLHHJSvr.BLL;
 using JLHHJSvr.Com;
 using JLHHJSvr.Com.Model;
@@ -72,6 +73,8 @@ namespace JLHHJSvr.Excutor
                     var outputFields = "mattressid,printid,itemname,bj_pzname,bj_pzname_mx,bj_pzname_mx_mx,wip_type,mtrlid,erp_mtrlid,useqty,dscrp,mtrlname,actual_useqty,qd_actual_size,qd_pfgroupqty,wrkgrpid,wrkgrpid2,ss_rate,ls_rate,sh_rate,wrkgrpcode1,wrkgrpcode2";
                     DbSqlHelper.SelectJoin(cmd, selectStr, "mattressid = @mattressid", new Dictionary<string, object>() { { "@mattressid", mattressid } }, "printid", outputFields, 0, 0, mattress_interface_qd_list);
 
+                    var interfaceHelper = HelperBase.GetHelper<InterfaceHelper>(cmd, new HelperBase.Context() { tokendata = tokendata });
+                    var interfaceList = interfaceHelper.GetMattressInterfaceList(mattressid, 0);
 
                     var ll_temp_dftwrkgrpid = 0;
 
@@ -128,6 +131,17 @@ namespace JLHHJSvr.Excutor
                         }
 
                         var _dscrp = mx.bj_pzname_mx_mx;
+                        var interfaceL = interfaceList.Where(o => mx.bj_pzname_mx_mx == o.bj_namemx).ToList();
+                        if (interfaceL.Count > 0)
+                        {
+                            var item = interfaceL[0];
+                            _dscrp = item.bj_namemx;
+                            if (!string.IsNullOrEmpty(item.actual_size)) _dscrp += " + " + item.actual_size;
+                            if (!string.IsNullOrEmpty(item.sb_craft)) _dscrp += " + " + item.sb_craft;
+                            if (!string.IsNullOrEmpty(item.actual_size_sb)) _dscrp += " + " + item.actual_size_sb;
+                            if (item.ss_rate != null && item.ss_rate > 0) _dscrp += " + " + item.ss_rate;
+                            if (item.ls_rate != null && item.ls_rate > 0) _dscrp += " + " + item.ls_rate;
+                        }
                         if (!string.IsNullOrEmpty(mx.wip_type) && !string.IsNullOrEmpty(bcpNames[mx.wip_type]))
                         {
                             _dscrp = bcpNames[mx.wip_type];

JLHHJSvr/Excutor/GetERPWrkGrpListExcutor.cs

@@ -25,17 +25,22 @@ namespace JLHHJSvr.Excutor
                 return;
             }
 
-            var erpHelper = HelperBase.GetHelper<ERPHelper>(null);
-
-            var parameters = new JObject();
-            if (request.wrkgrpid != null && request.wrkgrpid > 0)
+            using (var con = new SqlConnection(GlobalVar.ConnectionString))
+            using (var cmd = con.CreateCommand())
             {
-                parameters.Add("wrkgrpid", request.wrkgrpid);
-            }
+                con.Open();
+                var erpHelper = HelperBase.GetHelper<ERPHelper>(null);
 
-            var list = erpHelper.GetERPList<erp_sc_workgroup>("GetSCWorkgroupList", parameters);
+                //var wgp = new u_sc_workgroup();
+                //if (request.wrkgrpid != null && request.wrkgrpid > 0)
+                //{
+                //    wgp.Add("wrkgrpid", request.wrkgrpid);
+                //}
 
-            rslt.workgroupList = list;
+                var list = erpHelper.GetERPScWorkgroup(cmd);
+
+                rslt.workgroupList = list;
+            }
         }
     }
 }

JLHHJSvr/Excutor/GetResetWiptypeExcutor.cs

@@ -34,7 +34,7 @@ namespace JLHHJSvr.Excutor
                 {
                     var _bcpcompare = new u_bcpcompare() { pzname = qdmx.bj_pzname };
                     var _wip_type = "";
-                    if (DbSqlHelper.SelectOne(cmd, _bcpcompare, "wip_type") == 1)
+                    if (DbSqlHelper.SelectOne(cmd, _bcpcompare, "wip_type, wrkgrpcode2") == 1)
                     {
                         _wip_type = _bcpcompare.wip_type;
                     }

JLHHJSvr/Helper/ERPHelper.cs

@@ -250,6 +250,57 @@ namespace JLHHJSvr.Helper
                pagesize, mtrldefList, ref total);
             return mtrldefList;
         }
+        public List<u_sc_workgroup_erp> GetERPScWorkgroup(SqlCommand cmd)
+        {
+            var selectStr = @" SELECT wrkGrpid,
+                                wrkgrpcode,
+                                wrkGrpName,
+                                ifjj,
+                                ifprint,
+                                handtype,
+                                sonflag,
+                                parentid,
+                                inuse,
+                                storageid,
+                                opdate,
+                                opemp,
+                                moddate,
+                                modemp,
+                                ifwkpmtrlware,
+                                dscrp,
+                                empnum,
+                                avggz,
+                                jdtype,
+                                jdnum,
+                                tasktype,
+                                sys_changetime,
+                                userate,
+                                deptid,
+                                OTHour,
+                                shortrate,
+                                iflastfinish,
+                                barcode_check,
+                                ifauto_mode,
+                                ifbj,
+                                jjamt,
+                                finflowop
+                            FROM u_sc_workgroup_erp";
+            var whereList = new List<string>();
+            var parms = new Dictionary<string, object>();
+
+            //if (request.inuse != null && request.inuse.Value != -1)
+            //{
+            //    whereList.Add("u_sc_workgroup.inuse = @inuse ");
+            //    parms.Add("@inuse", request.inuse.Value);
+            //}
+
+            var scworkgroupList = new List<u_sc_workgroup_erp>();
+            var outputFields =
+                "wrkGrpid,wrkgrpcode,wrkGrpName,ifjj,ifprint,handtype,sonflag,parentid,inuse,storageid,opdate,opemp,moddate,modemp,ifwkpmtrlware,dscrp,empnum,avggz,jdtype,jdnum,tasktype,sys_changetime,userate,deptid,OTHour,shortrate,iflastfinish,barcode_check,ifauto_mode,ifbj,jjamt,finflowop";
+            DbSqlHelper.SelectJoin(cmd, selectStr, ListEx.GetWhereStr(whereList), parms, "wrkgrpcode", outputFields, 0, 0, scworkgroupList);
+
+            return scworkgroupList;
+        }
         // 提取请求构建逻辑
         private JObject BuildRequest(JObject parameters)
         {

JLHHJSvr/Helper/InterfaceHelper.cs

@@ -1258,9 +1258,11 @@ namespace JLHHJSvr.Helper
         {
             var _bcpcompare = new u_bcpcompare() { pzname = bj_pzname };
             var _wip_type = "";
-            if (DbSqlHelper.SelectOne(cmd, _bcpcompare, "wip_type") == 1)
+            var _wrkgrpcode2 = "";
+            if (DbSqlHelper.SelectOne(cmd, _bcpcompare, "wip_type, wrkgrpcode2") == 1)
             {
                 _wip_type = _bcpcompare.wip_type;
+                _wrkgrpcode2 = _bcpcompare.wrkgrpcode2;
             }
 
             var mattress_interface_qd = new u_mattress_interface_qd()
@@ -1271,7 +1273,8 @@ namespace JLHHJSvr.Helper
                 mtrlid = mtrlid,
                 useqty = useqty,
                 formulaid = formulaid,
-                wip_type = _wip_type
+                wip_type = _wip_type,
+                wrkgrpcode2 = _wrkgrpcode2
             };
 
             return mattress_interface_qd;

JLHHJSvr/JLHHJSvr.csproj

@@ -106,6 +106,7 @@
     <Compile Include="Com\GetMattressSubspecs.cs" />
     <Compile Include="Com\JLH_FetchPrice.cs" />
     <Compile Include="Com\ChangePassword.cs" />
+    <Compile Include="Com\Model\u_sc_workgroup_erp.cs" />
     <Compile Include="Com\Model\L1Mtrldef.cs" />
     <Compile Include="Com\Model\replacement_bednet.cs" />
     <Compile Include="Com\FormulaCheck.cs" />