Yangwl
/
lanju-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改在code上加了一个0 修复包公接口

Browse Source
master
zhaojian 2 years ago
parent f0467c983a
commit b82d78f7a0
9 changed files with 97 additions and 64 deletions
Show Stats Download Patch File Download Diff File

4
shangjian/AutoUpdate/bin/Debug/AutoUpdate.application
Unescape Escape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
<assemblyIdentity name="AutoUpdate.application" version="1.0.0.1" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" xmlns="urn:schemas-microsoft-com:asm.v1" />
<description asmv2:publisher="AutoUpdate" asmv2:product="AutoUpdate" xmlns="urn:schemas-microsoft-com:asm.v1" />
<description asmv2:publisher="HP" asmv2:product="AutoUpdate" xmlns="urn:schemas-microsoft-com:asm.v1" />
<deployment install="true" mapFileExtensions="true" />
<compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
<framework targetVersion="4.8" profile="Full" supportedRuntime="4.0.30319" />
@ -14,7 +14,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>kCr1fh10+EtMBHGFNQ8qK4lr256zI+0Jrd2pZnBY0uI=</dsig:DigestValue>
<dsig:DigestValue>Me9Xo9mBXudYE/51yJuvPG+bparg2CiQ+ufukPtZMoM=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

2
shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe.manifest
Unescape Escape View File

@ -49,7 +49,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>qnFKF+/3YlPAODyAGRSFG761uj8zOHLBVY6MUaXwrHc=</dsig:DigestValue>
<dsig:DigestValue>Po3RXPWGZu4mUxH1jVsl/Rdx6vzD+7hH//g0gawb1HM=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

4
shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.application
Unescape Escape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
<assemblyIdentity name="AutoUpdate.application" version="1.0.0.1" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" xmlns="urn:schemas-microsoft-com:asm.v1" />
<description asmv2:publisher="AutoUpdate" asmv2:product="AutoUpdate" xmlns="urn:schemas-microsoft-com:asm.v1" />
<description asmv2:publisher="HP" asmv2:product="AutoUpdate" xmlns="urn:schemas-microsoft-com:asm.v1" />
<deployment install="true" mapFileExtensions="true" />
<compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
<framework targetVersion="4.8" profile="Full" supportedRuntime="4.0.30319" />
@ -14,7 +14,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>kCr1fh10+EtMBHGFNQ8qK4lr256zI+0Jrd2pZnBY0uI=</dsig:DigestValue>
<dsig:DigestValue>Me9Xo9mBXudYE/51yJuvPG+bparg2CiQ+ufukPtZMoM=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

2
shangjian/XGL.Data/DBService/FormingMachineService.cs
Unescape Escape View File

@ -297,7 +297,7 @@ VALUES
'{LoginUser.UserCode}', '{LoginUser.UserName}', 'PC', '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}', '{LoginUser.UserName}', 'PREPARE',
'无', '{workTime}', '{deviceCode}', N'线体2', N'A01', '{selectRow["shift_id"]}',
NULL, NULL, NULL, NULL, '{LoginUser.UserName}', '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}',
'{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}', '{LoginUser.UserName}',GetDate(), '1', NULL, 'prod',
'{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}', '{LoginUser.UserName}',GetDate(), '0', NULL, 'prod',
{userCount}, '{costCenter}');";
//赵啸林说不用上位机更新报工标识
//string updateOrderSql = $@"update pro_order_workorder set status = 'w3', update_by = '{LoginUser.UserName}',update_time = GETDATE() where workorder_id = '{selectRow["workorder_id"]}' ";

15
shangjian/XGL.Model/Model/OrderPrepare/WcsSyncResult.cs
Unescape Escape View File

@ -17,4 +17,19 @@ namespace XGL.Models.Model.OrderPrepare
public int code { get; set; }
public string msg { get; set; }
}
public class Rootobjectresu
{
public string msg { get; set; }
public int code { get; set; }
public Data data { get; set; }
}
public class Data
{
public int code { get; set; }
public string msg { get; set; }
public object data { get; set; }
}
}

6
shangjian/XGL/Views/LanJu_Operator.xaml.cs
Unescape Escape View File

@ -481,13 +481,13 @@ namespace XGL.Views
DataTable dtNewRFID = formingMachineService.GetNewRFID();
if (dtNewRFID == null || dtNewRFID.Rows.Count == 0)
{
newRfid = "B" + DateTime.Now.ToString("yyyyMMdd") + "001";
newRfid = "B" + DateTime.Now.ToString("yyyyMMdd") + "0001";
}
else
{
if (string.IsNullOrEmpty(dtNewRFID.Rows[0]["report_code"].ToString()))
{
newRfid = "B" + DateTime.Now.ToString("yyyyMMdd") + "001";
newRfid = "B" + DateTime.Now.ToString("yyyyMMdd") + "0001";
}
else
{
@ -524,7 +524,7 @@ VALUES
'{item["workorder_code"]}',
'{item["product_code"]}',
NULL,
'B{DateTime.Now.ToString("yyyyMMdd")}001',
'B{DateTime.Now.ToString("yyyyMMdd")}0001',
'af69d35181624b00848958c93c875818',
NULL,
GetDate(),

20
shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs
Unescape Escape View File

@ -406,6 +406,8 @@ namespace XGLFinishPro.Views
}
private async void btnComplete_Click(object sender, RoutedEventArgs e)
{
try
{
var selectedRow = (dgWorkOrderInfo.SelectedItem as DataRowView); //dgWorkOrderInfo.SelectedItem as FoamingMacModel;
if (selectedRow == null)
@ -422,17 +424,17 @@ namespace XGLFinishPro.Views
DataTable dtNewReportCode = formingMachineService.GetReportCode();
if (dtNewReportCode == null || dtNewReportCode.Rows.Count == 0)
{
newReportCode = DateTime.Now.ToString("yyyyMMdd") + "001";
newReportCode = DateTime.Now.ToString("yyyyMMdd") + "0001";
}
else
{
if (string.IsNullOrEmpty(dtNewReportCode.Rows[0]["report_code"].ToString()))
{
newReportCode = DateTime.Now.ToString("yyyyMMdd") + "001";
newReportCode = DateTime.Now.ToString("yyyyMMdd") + "0001";
}
else
{
newReportCode = (Convert.ToInt32(dtNewReportCode.Rows[0]["report_code"].ToString()) + 1).ToString();
newReportCode = (Convert.ToInt64(dtNewReportCode.Rows[0]["report_code"].ToString()) + 1).ToString();
}
}
ExecReportWorkWin execReport = new ExecReportWorkWin(selectedRow["workorder_code"].ToString(), selectedRow["quantity_split"].ToString());
@ -454,9 +456,9 @@ namespace XGLFinishPro.Views
var jsonContent = JsonConvert.SerializeObject(reportWork);
LogHelper.instance.log.Info("开始报工>>" + jsonContent);
RestHelper restClient = new RestHelper();
var response = await restClient.PostAsync(apiUrl, jsonContent);
//var response =;
MesResult result = Utils.DeJson<MesResult>(response);
Rootobjectresu result = Utils.DeJson<Rootobjectresu>(await restClient.PostAsync(apiUrl, jsonContent));
if (result.code == 200)
{
@ -469,9 +471,15 @@ namespace XGLFinishPro.Views
}
else
{
CustomMessageBox.Show("报工失败",CustomMessageBoxButton.OK,CustomMessageBoxIcon.Error);
CustomMessageBox.Show("报工失败", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Error);
}
}
}
catch (Exception ex)
{
}
}

4
shangjian/XGLFinishPro/XGLFinishPro.csproj
Unescape Escape View File

@ -811,6 +811,10 @@
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AutoUpdate\AutoUpdate.csproj">
<Project>{341ad485-e4a2-4a2c-9e93-9d4e360d692c}</Project>
<Name>AutoUpdate</Name>
</ProjectReference>
<ProjectReference Include="..\CentralControl\CentralControl.csproj">
<Project>{93e27248-65cd-4e02-abe3-645d7d5a519c}</Project>
<Name>CentralControl</Name>

6
shangjian/XGLFinishPro/XGLFinishPro.csproj.user
Unescape Escape View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<PublishUrlHistory />
</PropertyGroup>
</Project>
Write Preview
Loading…
Cancel
Save