From fa13a15bd7e014558189f2db7d7a80a1999f37cc Mon Sep 17 00:00:00 2001 From: Jjie <1005539536@qq.com> Date: Fri, 25 Jul 2025 14:22:28 +0800 Subject: [PATCH] no message --- .gitignore | 318 +++++++++++++++++- NFine.Application/PNSRM/CreateItemLotApp.cs | 2 +- .../PNSRM/Views/CreateItemLot/Index.cshtml | 125 +++++++ 3 files changed, 431 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 9c4f92d..b5a74a9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,305 @@ -NFine.Data/obj/Debug/NFine.Data.csprojAssemblyReference.cache -NFine.Domain/obj/Debug/NFine.Domain.csprojAssemblyReference.cache -.vs/NFine.Framework/v15/Server/sqlite3/storage.ide-wal -NFine.Application/obj/Debug/NFine.Application.csprojAssemblyReference.cache -NFine.Mapping/obj/Debug/NFine.Mapping.csprojAssemblyReference.cache -.vs/NFine.Framework/v15/Server/sqlite3/storage.ide-shm -.vs/NFine.Framework/v15/Server/sqlite3/storage.ide -NFine.Code/obj/Debug/NFine.Code.csprojAssemblyReference.cache -NFine.Repository/obj/Debug/NFine.Repository.csprojAssemblyReference.cache -NFine.Web/obj/Debug/NFine.Web.csprojAssemblyReference.cache -.vs/config/applicationhost.config -.vs/NFine.Framework/v15/.suo -.vs/NFine.Framework/v15/Server/sqlite3/db.lock +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# User-specific files +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# DNX +project.lock.json +project.fragment.lock.json +artifacts/ + +*_i.c +*_p.c +*_i.h +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# TODO: Comment the next line if you want to checkin your web deploy settings +# but database connection strings (with potential passwords) will be unencrypted +#*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/packages/* +# except build/, which is used as an MSBuild target. +!**/packages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/packages/repositories.config +# NuGet v3's project.json files produces more ignoreable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +node_modules/ +orleans.codegen.cs + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +*.mdf +*.ldf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush +.cr/ + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc +WMS-BS/NFine.Web/File/InspectionFile/0000000341.txt +WMS-BS/NFine.Web/Areas/WMS/Views/FinishedProductWarehouseEntry.zip +*.zip +WMS-BS/NFine.Web/WMS/Print/PrintTemp/PrintTemp20240314162601892922.txt +SRM/NFine.Web/Areas/SRM/Views/DXCreateItemLot.rar +SRM/NFine.Web/Areas/SRM/Views/EcharsPerForm/PoJBPrice.cshtml +SRM/NFine.Web/File/ZTBFile/2024042909/异常单对应表.txt +SRM/NFine.Web/File/ZTBFile/2024042910/异常单对应表.txt +<<<<<<< HEAD +WMS-BS.rar +======= +/SRM/NFine.Code/NFine.Code.csproj +/SRM/NFine.Code/NFine.Code.csproj +>>>>>>> 20c64597bbdf12398957a1f7aaf8428c2ab43622 +/WMS-BS/packages/WebGrease.1.6.0 +/WMS-BS/packages/bootstrap.3.0.0 +/WMS-BS/packages/Dapper.1.50.0 +/WMS-BS/packages/Dapper.Contrib.1.50.0 +/WMS-BS/packages/DapperExtensions.1.6.0 +/WMS-BS/packages/EntityFramework.6.1.3 +/WMS-BS/packages/jQuery.1.10.2 +/WMS-BS/packages/jQuery.Validation.1.11.1 +/WMS-BS/packages/Microsoft.AspNet.Mvc.5.2.3 +/WMS-BS/packages/Microsoft.AspNet.Mvc.zh-Hans.5.2.3 +/WMS-BS/packages/Microsoft.AspNet.Razor.3.2.3 +/WMS-BS/packages/Microsoft.AspNet.Razor.zh-Hans.3.2.3 +/WMS-BS/packages/Microsoft.AspNet.WebPages.3.2.3 +/WMS-BS/packages/Microsoft.AspNet.WebPages.zh-Hans.3.2.3 +/WMS-BS/packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0 +/WMS-BS/packages/Microsoft.jQuery.Unobtrusive.Validation.3.0.0 +/WMS-BS/packages/Microsoft.Web.Infrastructure.1.0.0.0 +/WMS-BS/packages/Modernizr.2.6.2 +/WMS-BS/packages/Newtonsoft.Json.9.0.1 +WMS-BS/NFine.Web/WMS/Print/PrintTemp/PrintTemp20240902145338827570.txt +WMS-BS/NFine.Web/WMS/Print/PrintTemp/PrintTemp20240902153645164426.txt +WMS-BS/NFine.Web/WMS/Print/PrintTemp/PrintTemp20240902154042803570.txt +WMS-BS/NFine.Web/WMS/Print/PrintTemp/PrintTemp20240902154218759184.txt +WMS-BS/NFine.Web/WMS/Print/PrintTemp/PrintTemp20240902154254122834.txt +WMS-BS/NFine.Web/WMS/Print/PrintTemp/PrintTemp20240902154410234056.txt +WMS-BS/NFine.Web/File/UPLoadFile/20241215034912NCR数量.xls +WMS-BS/NFine.Web/File/UPLoadFile/20241215040452NCR数量.xlsx +WMS-BS/NFine.Web/File/UPLoadFile/20241215040545NCR数量.xlsx +WMS-BS/NFine.Web/File/UPLoadFile/20241215040546NCR数量.xlsx +WMS-BS/NFine.Web/File/UPLoadFile/20241215040610NCR数量.xlsx diff --git a/NFine.Application/PNSRM/CreateItemLotApp.cs b/NFine.Application/PNSRM/CreateItemLotApp.cs index 9b9c4c0..51a233b 100644 --- a/NFine.Application/PNSRM/CreateItemLotApp.cs +++ b/NFine.Application/PNSRM/CreateItemLotApp.cs @@ -81,7 +81,7 @@ namespace NFine.Application.PNSRM string sql = @"SELECT distinct a.ID,asn.ASNCode,asn.Sequence as AsnSequence, a.POCode,a.Sequence,CONVERT(NVARCHAR(15),a.CreateDateTime,23) AS PODate, a.ExtensionID,a.VenCode,ee.VenName,a.InvCode, b.InvName,b.InvStd,b.InvUnit,asn.Quantity,ISNULL(bb.LotQty,0) AS LotQty ,b.InvDesc,b.ClassCode, - isnull(asn.DNQuantity,0) as InQuantity,a.WorkPoint as WorkPointCode + isnull(asn.DNQuantity,0) as InQuantity,a.WorkPoint as WorkPointCode,b.EffectiveEnable,b.EffectiveDays ,CreatePerson,e.ProjectCode,a.SignBackStatus as SignBackStatus ," + EATTRIBUTE + ""; sql += @",a.MTIME,isnull(b.EATTRIBUTE2,0) as MINQty ,b.EffectiveDays,b.EffectiveEnable diff --git a/NFine.Web/Areas/PNSRM/Views/CreateItemLot/Index.cshtml b/NFine.Web/Areas/PNSRM/Views/CreateItemLot/Index.cshtml index 79eaf6f..62dbf08 100644 --- a/NFine.Web/Areas/PNSRM/Views/CreateItemLot/Index.cshtml +++ b/NFine.Web/Areas/PNSRM/Views/CreateItemLot/Index.cshtml @@ -975,6 +975,131 @@ } } + + + + function btnAllCreate() { + debugger; + var PoStatus; + var jsonData = ''; + var ids = $("#gridList").jqGrid('getGridParam', 'selarrrow'); //获取 多行数据 + //if (ids.length != 1) { + // $.modalAlertNew("WMS00100"); + // return; + //} + var POCode = ""; + var PORow = ""; + var VenCode = ""; + var WorkPoint = ""; + var VendorLot = ""; + + //采购 + if (Type == '1') { + var BatchCode = ""; + $.ajax({ + url: "/PNSRM/CreateItemLot/GetVendorLotNo?InvCode=" + InvCode + "&WorkPoint=" + WorkPoints, + //data: { keyValue: keyValue }, + dataType: "json", + async: false, + success: function (data) { + BatchCode=data.VendorLotNo; + } + }); + debugger; + var ARR = []; + for (var i in ids) { + ID = $("#gridList").jqGrid('getRowData', ids[i]).ID; + Code = $("#gridList").jqGrid('getRowData', ids[i]).POCode; + Sequence = $("#gridList").jqGrid('getRowData', ids[i]).Sequence; + EffectiveEnable = $("#gridList").jqGrid('getRowData', ids[i]).EffectiveEnable; + EffectiveDays = $("#gridList").jqGrid('getRowData', ids[i]).EffectiveDays; + + // console.log("单号:" + ODNCode + ",行号:" + Sequence + ",站位:" + WorkPoints); + + var thisCreateQty = $("#gridList").jqGrid('getRowData', ids[i]).Quantity * 1 - $("#gridList").jqGrid('getRowData', ids[i]).LotQty * 1;//本次生成数量 + if (thisCreateQty == 0) { + $.modalAlert("该单据条码已全部生成完毕!"); + return; + } + thisCreateQty = thisCreateQty.toFixed(4); + var minPackQty = thisCreateQty;//最小包装量 + //minPackQty = minPackQty.toFixed(4); + var createPageCount = 1;//本次生成张数 + createPageCount = createPageCount.toFixed(0); + console.log("thisCreateQty:" + thisCreateQty + ",minPackQty:" + minPackQty); + + var Quantity = $("#gridList").jqGrid('getRowData', ids[i]).Quantity * 1;//采购订单总数 + Quantity = Quantity.toFixed(2); + var CreatedQty = $("#gridList").jqGrid('getRowData', ids[i]).LotQty * 1;//已生成数量 + CreatedQty = CreatedQty.toFixed(2); + // console.log("Quantity:" + Quantity + ",CreatedQty:" + CreatedQty); + if (Quantity == CreatedQty) { + return false; + } + var PRODUCTDATE = new Date().getFullYear() + "-" + (new Date().getMonth() + 1) + "-" + new Date().getDate();//条码生产日期 + if (EffectiveEnable == 'true') { + var ExpirationDate = dateChange(EffectiveDays, PRODUCTDATE); + } else { + var ExpirationDate = '2999-12-31 00:00:00.000';//条码失效日期 + } + + + + // console.log("ExpirationDate:" + ExpirationDate + ",PRODUCTDATE:" + PRODUCTDATE); + + var obj = { + ID: ID, + Code: Code, + Sequence: Sequence, + thisCreateQty: thisCreateQty, + minPackQty: minPackQty, + createPageCount: createPageCount, + //VendorLot: VendorLot, + PRODUCTDATE: PRODUCTDATE, + ExpirationDate: ExpirationDate, + Amount: $("#gridList").jqGrid('getRowData', ids[i]).Amount * 1, + //自由项 + ProjectCode: '', + BatchCode: BatchCode, + Version: '', + Brand: '', + cFree1: '', + cFree2: '', + cFree3: '', + cFree4: '', + cFree5: '', + cFree6: '', + cFree7: '', + cFree8: '', + cFree9: '', + cFree10: '', + } + + ARR.push(obj); + } + + $.submitForm({ + url: "/PNSRM/CreateItemLot/SubmitFormCGALL" + "?" + Math.random(), + param: { + keyValue: JSON.stringify(ARR) + }, + success: function () { + $.currentWindow().$("#gridList").trigger("reloadGrid"); + } + }) + } + + + } + + + + + + + + +