baogq
/
JYHB-WCS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change -修改扫描入库界面，收料通知单和已入库数量都显示，在入库时入库数量不能大于这两个之和。

Browse Source
master
启龙 曹 7 months ago
parent 93bc81bc7b
commit 8632206a33
4 changed files with 88 additions and 80 deletions
Show Stats Download Patch File Download Diff File

152
src/Khd.Core.Domain/Models/MesPurchaseReceiveBill.cs
Unescape Escape View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
using System.Linq; using System.Linq;
namespace Models namespace Khd.Core.Domain.Models
{ {
/// <summary> /// <summary>
/// 采购收料通知单;从ERP同步过来的信息，需要与物料信息关联，需要确认接口同步过来的信息内容 /// 采购收料通知单;从ERP同步过来的信息，需要与物料信息关联，需要确认接口同步过来的信息内容
@ -16,177 +16,177 @@ namespace Models
/// 默认值: /// 默认值:
///</summary> ///</summary>
[Key] [Key]
[Column("receive_bill_id") ] [Column("receive_bill_id")]
public long Receive_bill_id { get; set; } public long Receive_bill_id { get; set; }
/// <summary> /// <summary>
/// 备 注:ERP的主键信息;对应FID /// 备 注:ERP的主键信息;对应FID
/// 默认值: /// 默认值:
///</summary> ///</summary>
[Column("erp_id" ) ] [Column("erp_id")]
public long? Erp_id { get; set; } public long? Erp_id { get; set; }
/// <summary> /// <summary>
/// 备 注:对应金蝶ERP收料单明细的ID;对应FDetailEntity_FEntryID /// 备 注:对应金蝶ERP收料单明细的ID;对应FDetailEntity_FEntryID
/// 默认值: /// 默认值:
///</summary> ///</summary>
[Column("fentry_id" ) ] [Column("fentry_id")]
public long? Fentry_id { get; set; } public long? Fentry_id { get; set; }
/// <summary> /// <summary>
/// 备 注:收料单据号;对应FBillNo /// 备 注:收料单据号;对应FBillNo
/// 默认值: /// 默认值:
///</summary> ///</summary>
[Column("bill_no") ] [Column("bill_no")]
public string? Bill_no { get; set; } public string Bill_no { get; set; }
/// <summary> /// <summary>
/// 备 注:采购订单编号;对应FOrderBillNo /// 备 注:采购订单编号;对应FOrderBillNo
/// 默认值: /// 默认值:
///</summary> ///</summary>
[Column("po_no") ] [Column("po_no")]
public string? Po_no { get; set; } public string Po_no { get; set; }
/// <summary> /// <summary>
/// 备 注:单据状态;FDocumentStatus /// 备 注:单据状态;FDocumentStatus
/// 默认值: /// 默认值:
///</summary> ///</summary>
[Column("document_status") ] [Column("document_status")]
public string? Document_status { get; set; } public string Document_status { get; set; }
/// <summary> /// <summary>
/// 备 注:ERP物料ID;FMaterialId /// 备 注:ERP物料ID;FMaterialId
/// 默认值: /// 默认值:
///</summary> ///</summary>
[Column("material_id") ] [Column("material_id")]
public long? Material_id { get; set; } public long? Material_id { get; set; }
/// <summary> /// <summary>
/// 备 注:物料编码;对应FMaterialId.FNumber /// 备 注:物料编码;对应FMaterialId.FNumber
/// 默认值: /// 默认值:
///</summary> ///</summary>
[Column("material_code") ] [Column("material_code")]
public string Material_code { get; set; } = null!; public string Material_code { get; set; } = null!;
/// <summary> /// <summary>
/// 备 注:物料名称;对应FMaterialId.FName /// 备 注:物料名称;对应FMaterialId.FName
/// 默认值: /// 默认值:
///</summary> ///</summary>
[Column("material_name") ] [Column("material_name")]
public string? Material_name { get; set; } public string Material_name { get; set; }
/// <summary> /// <summary>
/// 备 注:源单内码;对应FDetailEntity_Link_FSBillId /// 备 注:源单内码;对应FDetailEntity_Link_FSBillId
/// 默认值: /// 默认值:
///</summary> ///</summary>
[Column("fs_bill_id") ] [Column("fs_bill_id")]
public string? Fs_bill_id { get; set; } public string Fs_bill_id { get; set; }
/// <summary> /// <summary>
/// 备 注:源单分录内码;对应FDetailEntity_Link_FSId /// 备 注:源单分录内码;对应FDetailEntity_Link_FSId
/// 默认值: /// 默认值:
///</summary> ///</summary>
[Column("fs_id") ] [Column("fs_id")]
public string? Fs_id { get; set; } public string Fs_id { get; set; }
/// <summary> /// <summary>
/// 备 注:实到数量;对应FActlandQty /// 备 注:实到数量;对应FActlandQty
/// 默认值: /// 默认值:
///</summary> ///</summary>
[Column("act_land_amount") ] [Column("act_land_amount")]
public decimal? Act_land_amount { get; set; } public decimal? Act_land_amount { get; set; }
/// <summary> /// <summary>
/// 备 注:交货数量;对应FActReceiveQty /// 备 注:交货数量;对应FActReceiveQty
/// 默认值: /// 默认值:
///</summary> ///</summary>
[Column("act_receive_amount") ] [Column("act_receive_amount")]
public decimal? Act_receive_amount { get; set; } public decimal? Act_receive_amount { get; set; }
/// <summary> /// <summary>
/// 备 注:审核日期;对应FApproveDate /// 备 注:审核日期;对应FApproveDate
/// 默认值: /// 默认值:
///</summary> ///</summary>
[Column("approve_date") ] [Column("approve_date")]
public DateTime? Approve_date { get; set; } public DateTime? Approve_date { get; set; }
/// <summary> /// <summary>
/// 备 注:ERP最后修改日期;对应FModifyDate /// 备 注:ERP最后修改日期;对应FModifyDate
/// 默认值: /// 默认值:
///</summary> ///</summary>
[Column("erp_modify_date") ] [Column("erp_modify_date")]
public DateTime? Erp_modify_date { get; set; } public DateTime? Erp_modify_date { get; set; }
/// <summary> /// <summary>
/// 备 注:采购组织;FPurchaseOrgId /// 备 注:采购组织;FPurchaseOrgId
/// 默认值: /// 默认值:
///</summary> ///</summary>
[Column("purchase_org_id") ] [Column("purchase_org_id")]
public long? Purchase_org_id { get; set; } public long? Purchase_org_id { get; set; }
/// <summary> /// <summary>
/// 备 注:京源项目;F_TOND_Base /// 备 注:京源项目;F_TOND_Base
/// 默认值: /// 默认值:
///</summary> ///</summary>
[Column("tond_base") ] [Column("tond_base")]
public string? Tond_base { get; set; } public string Tond_base { get; set; }
/// <summary> /// <summary>
/// 备 注:单价;FPRICE /// 备 注:单价;FPRICE
/// 默认值: /// 默认值:
///</summary> ///</summary>
[Column("price") ] [Column("price")]
public decimal? Price { get; set; } public decimal? Price { get; set; }
/// <summary> /// <summary>
/// 备 注:供应商ID;FSupplierId /// 备 注:供应商ID;FSupplierId
/// 默认值: /// 默认值:
///</summary> ///</summary>
[Column("supplier_id") ] [Column("supplier_id")]
public long? Supplier_id { get; set; } public long? Supplier_id { get; set; }
/// <summary> /// <summary>
/// 备 注:备注 /// 备 注:备注
/// 默认值: /// 默认值:
///</summary> ///</summary>
[Column("remark") ] [Column("remark")]
public string? Remark { get; set; } public string Remark { get; set; }
/// <summary> /// <summary>
/// 备 注:创建人 /// 备 注:创建人
/// 默认值: /// 默认值:
///</summary> ///</summary>
[Column("create_by") ] [Column("create_by")]
public string? Create_by { get; set; } public string Create_by { get; set; }
/// <summary> /// <summary>
/// 备 注:创建时间 /// 备 注:创建时间
/// 默认值: /// 默认值:
///</summary> ///</summary>
[Column("create_time") ] [Column("create_time")]
public DateTime? Create_time { get; set; } public DateTime? Create_time { get; set; }
/// <summary> /// <summary>
/// 备 注:更新人 /// 备 注:更新人
/// 默认值: /// 默认值:
///</summary> ///</summary>
[Column("update_by") ] [Column("update_by")]
public string? Update_by { get; set; } public string Update_by { get; set; }
/// <summary> /// <summary>
/// 备 注:更新时间 /// 备 注:更新时间
/// 默认值: /// 默认值:
///</summary> ///</summary>
[Column("update_time") ] [Column("update_time")]
public DateTime? Update_time { get; set; } public DateTime? Update_time { get; set; }
/// <summary> /// <summary>
/// 备 注:预计到货日期 /// 备 注:预计到货日期
/// 默认值: /// 默认值:
///</summary> ///</summary>
[Column("pre_delivery_date") ] [Column("pre_delivery_date")]
public DateTime? Pre_delivery_date { get; set; } public DateTime? Pre_delivery_date { get; set; }
} }
} }

1
src/Khd.Core.EntityFramework/DefaultDbContext.cs
Unescape Escape View File

@ -2,7 +2,6 @@
using Khd.Core.Domain.Dto.agv; using Khd.Core.Domain.Dto.agv;
using Khd.Core.Domain.Models; using Khd.Core.Domain.Models;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Models;
namespace Khd.Core.EntityFramework namespace Khd.Core.EntityFramework
{ {

6
src/Khd.Core.Wpf/Form/FormBoardT.xaml
Unescape Escape View File

@ -2154,8 +2154,10 @@
<TextBlock Text="扫描条码号:" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" /> <TextBlock Text="扫描条码号:" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" />
<TextBlock Text="物料名称:" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" /> <TextBlock Text="物料名称:" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" />
<TextBlock Text="物料规格:" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" /> <TextBlock Text="物料规格:" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" />
<TextBlock Text="收料通知单数量:" Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" /> <TextBlock Text="收料单数量/已入库数量:" Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="3" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" />
<TextBlock x:Name="orderNumText" Grid.Column="2" Grid.Row="5" FontSize="60" Grid.ColumnSpan="3" Width="400" Height="100" Foreground="White" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0,30,0,0"/> <TextBlock x:Name="orderNumText" Grid.Column="3" Grid.Row="5" FontSize="60" Grid.ColumnSpan="1" Width="260" Height="100" Foreground="White" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,30,0,0"/>
<TextBlock Text="/" Grid.Column="4" Grid.Row="5" FontSize="75" Grid.ColumnSpan="1" Width="50" Height="100" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,10,0,0"/>
<TextBlock x:Name="stockNumText" Grid.Column="5" Grid.Row="5" FontSize="60" Grid.ColumnSpan="1" Width="260" Height="100" Foreground="White" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0,30,0,0"/>
<TextBlock Text="入库数量:" Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" /> <TextBlock Text="入库数量:" Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" />
<TextBlock Text="单位:" Grid.Row="6" Grid.Column="3" Grid.ColumnSpan="1" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" Width="172" /> <TextBlock Text="单位:" Grid.Row="6" Grid.Column="3" Grid.ColumnSpan="1" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" Width="172" />
<TextBlock Text="备注信息:" Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" /> <TextBlock Text="备注信息:" Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" />

9
src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
Unescape Escape View File

@ -2263,7 +2263,8 @@ namespace Khd.Core.Wpf.Form
} }
decimal amount = decimal.Parse(txtInScan.Text); decimal amount = decimal.Parse(txtInScan.Text);
decimal orderAmount = decimal.Parse(orderNumText.Text); decimal orderAmount = decimal.Parse(orderNumText.Text);
if (amount > orderAmount) decimal stockAmount = decimal.Parse(stockNumText.Text);
if (amount + stockAmount > orderAmount)//输入数量与库存数之和不能大于收料通知单数量
{ {
HandyControl.Controls.MessageBox.Error("入库数量不能超过收料通知单数量"); HandyControl.Controls.MessageBox.Error("入库数量不能超过收料通知单数量");
return; return;
@ -2702,6 +2703,12 @@ namespace Khd.Core.Wpf.Form
{ {
orderNumText.Text = "无收料通知单"; orderNumText.Text = "无收料通知单";
} }
//查找现有库存
var rawStock = dbContext.WmsRawStock.FirstOrDefault(x => x.materialId == material.materialId);
if (rawStock != null)
{
stockNumText.Text = rawStock.totalAmount.ToString();
}
//显示单位信息 //显示单位信息
var mesBaseUnitInfo = dbContext.MesBaseUnitInfo.FirstOrDefault(t => t.ErpId == mesBaseMaterialInfo.MaterialUnitId); var mesBaseUnitInfo = dbContext.MesBaseUnitInfo.FirstOrDefault(t => t.ErpId == mesBaseMaterialInfo.MaterialUnitId);

Write Preview
Loading…
Cancel
Save