排产计划查询中生产车间过滤字段改成字符串类型；凯贝添加excel导入日计划方法；凯贝提料运算改成和宝工一个方法；返修码生成模块添加机型码字段

yusijie

3 天以前 1ce73b98043f2fd3f0262c8f85471e5888f486eb

 WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs

@@ -43,7 +43,7 @@
                omdelMian = JsonConvert.DeserializeObject<Sc_WorkBillSortBillMain>(sWhere);

                ds = oCN.RunProcReturn($"exec h_p_JIT_Sc_WorkBillSortBill_Query '{omdelMian.HPlanBeginDate}',{(omdelMian.HProdORGID == null ? 0 : omdelMian.HProdORGID)},'{omdelMian.HSeOrderBillNo}'" +
                    $",'{omdelMian.HPlanEndDate.AddDays(1)}',{omdelMian.HMaterID},'{omdelMian.HICMOBillNo}',{omdelMian.HWorkShopID}" +
                    $",'{omdelMian.HPlanEndDate.AddDays(1)}',{omdelMian.HMaterID},'{omdelMian.HICMOBillNo}','{omdelMian.HWorkShopID}'" +
                    $",'{omdelMian.HMastersDate}','{omdelMian.sWheres}'", "h_p_JIT_Sc_WorkBillSortBill_Query");

                objJsonResult.code = "1";
@@ -1981,13 +1981,13 @@
                        sqlName = "AIS20210811135644";
                    }

                    if (WMS_CampanyName == "瀹濆伐" || WMS_CampanyName == "娣诲悍绉戞妧")
                    if (WMS_CampanyName == "瀹濆伐" || WMS_CampanyName == "娣诲悍绉戞妧" || WMS_CampanyName == "鍑礉濂堢壒")
                    {
                        objJsonResult = (json)JIT_MOMaterLack(fProWorkShopId, fPrdOrgId, user);
                    }
                    else if (HTLType == "缂烘枡")
                    {
                        if (WMS_CampanyName == "甯呭▉" || WMS_CampanyName == "鍑礉濂堢壒" /*|| WMS_CampanyName == "娣诲悍绉戞妧"*/)
                        if (WMS_CampanyName == "甯呭▉" /*|| WMS_CampanyName == "鍑礉濂堢壒" || WMS_CampanyName == "娣诲悍绉戞妧"*/)
                        {
                            objJsonResult = (json)JIT_QL(fProWorkShopId, fPrdOrgId, user, sqlName);
                        }