From 1a29ad0fea9932f3d0bb56c939ccc32c877a34d8 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期一, 19 二月 2024 16:08:59 +0800
Subject: [PATCH] 1
---
Pda/View/AsnSetting/productEnterQuantity.html | 33 +++++++---
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 23 +++++++
HTML/views/ASNSetting/PalletBind.html | 56 +++++++++++++++---
Wms/WMS.BLL/BllAsnServer/AuditLogServer.cs | 41 +++++++------
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 6 +-
5 files changed, 115 insertions(+), 44 deletions(-)
diff --git a/HTML/views/ASNSetting/PalletBind.html b/HTML/views/ASNSetting/PalletBind.html
index 09c9fa5..0a07864 100644
--- a/HTML/views/ASNSetting/PalletBind.html
+++ b/HTML/views/ASNSetting/PalletBind.html
@@ -62,22 +62,40 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鎵�灞炰粨搴�</label>
+ <div class="layui-input-inline">
+ <select name="WareHouseNo" id="WareHouseNo" lay-filter="ImportExecuteFlag" lay-search>
+ <option value=""></option>
+ <option value="W01">鍔涜绔嬩綋搴�</option>
+ <option value="W02">鍔涜骞冲簱</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label" style="width: 60px;">鎵�灞炲贩閬�</label>
<div class="layui-input-inline">
<select name="RoadwayNo" id="RoadwayNo" lay-filter="ImportExecuteFlag" lay-search>
<option value=""></option>
<option value="R01">01宸烽亾</option>
<option value="R02">02宸烽亾</option>
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">鎵�灞炰粨搴�</label>
- <div class="layui-input-inline">
- <select name="WareHouseNo" id="WareHouseNo" lay-filter="ImportExecuteFlag" lay-search>
- <option value=""></option>
- <option value="W01">09浠撳簱</option>
- <option value="W02">09闆剁搴�</option>
+ <option value="R03">03宸烽亾</option>
+ <option value="R04">04宸烽亾</option>
+ <option value="R05">05宸烽亾</option>
+ <option value="R06">06宸烽亾</option>
+ <option value="R07">07宸烽亾</option>
+ <option value="R08">08宸烽亾</option>
+ <option value="R09">09宸烽亾</option>
+ <option value="R10">10宸烽亾</option>
+ <option value="R11">11宸烽亾</option>
+ <option value="R12">12宸烽亾</option>
+ <option value="R13">13宸烽亾</option>
+ <option value="R14">14宸烽亾</option>
+ <option value="R15">15宸烽亾</option>
+ <option value="R16">16宸烽亾</option>
+ <option value="R17">17宸烽亾</option>
+ <option value="R18">18宸烽亾</option>
+ <option value="R19">19宸烽亾</option>
+ <option value="R20">20宸烽亾</option>
</select>
</div>
</div>
@@ -340,6 +358,24 @@
switch (d.RoadwayNo) {
case "R01": return '01宸烽亾';
case "R02": return '02宸烽亾';
+ case "R03": return '03宸烽亾';
+ case "R04": return '04宸烽亾';
+ case "R05": return '05宸烽亾';
+ case "R06": return '06宸烽亾';
+ case "R07": return '07宸烽亾';
+ case "R08": return '08宸烽亾';
+ case "R09": return '09宸烽亾';
+ case "R10": return '10宸烽亾';
+ case "R11": return '11宸烽亾';
+ case "R12": return '12宸烽亾';
+ case "R13": return '13宸烽亾';
+ case "R14": return '14宸烽亾';
+ case "R15": return '15宸烽亾';
+ case "R16": return '16宸烽亾';
+ case "R17": return '17宸烽亾';
+ case "R18": return '18宸烽亾';
+ case "R19": return '19宸烽亾';
+ case "R20": return '20宸烽亾';
default: return "";
}
diff --git a/Pda/View/AsnSetting/productEnterQuantity.html b/Pda/View/AsnSetting/productEnterQuantity.html
index da587ad..771b746 100644
--- a/Pda/View/AsnSetting/productEnterQuantity.html
+++ b/Pda/View/AsnSetting/productEnterQuantity.html
@@ -311,6 +311,7 @@
</div>
</div>
</td>
+ <td></td>
</tr>
<tr>
<td>
@@ -921,17 +922,29 @@
if (res.code == 0) { //鎴愬姛
asnDetails = res.data;
for (var i = 0; i < res.data.length; i++) {
- if (i == 0) {
- $("#goodSelect1").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
- .SkuName);
- } else {
- $("#goodSelect1").append('<option value =' + res.data[i].Id + '>' + res.data[i]
- .SkuName);
- }
- if (res.data[i].LotNo != null)
- {
- $("#goodSelect1").append("-" + res.data[i].LotNo +
+ if(skuNo!='' && skuNo==res.data[i].SkuNo){
+ if (i == 0) {
+ $("#goodSelect1").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
+ .SkuName);
+ } else {
+ $("#goodSelect1").append('<option value =' + res.data[i].Id + '>' + res.data[i]
+ .SkuName);
+ }
+ if (res.data[i].LotNo != null)
+ {
+ $("#goodSelect1").append("-" + res.data[i].LotNo +
+ '</option>');
+ }
+ }else {
+ if(res.data[i].LotNo=='' || res.data[i].LotNo == null){
+ $("#goodSelect1").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
+ .SkuName +
'</option>');
+ }else{
+ $("#goodSelect1").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
+ .SkuName + "-" + res.data[i].LotNo +
+ '</option>');
+ }
}
}
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index 115195f..6fc3978 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -249,6 +249,15 @@
throw new Exception("鍗曟嵁绫诲瀷涓嶅彲涓虹┖!");
}
}
+ //鍒ゆ柇鏄惁涓洪噰璐叆搴撳崟鎹垨杞﹂棿浣欐枡閫�鍥炲叆搴�
+ // 0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 2锛氫腑闂村搧鍏ュ簱 3锛氶��璐у叆搴� 4锛氳溅闂翠綑鏂欓��鍥炲叆搴� 5锛氬叾瀹冨叆搴� 6锛氫唬鍌ㄥ叆搴� 7锛氬瘎瀛樺叆搴�
+ if (model.Type == "1" || model.Type == "4")
+ {
+ if (!string.IsNullOrWhiteSpace(model.LotNo))
+ {
+ throw new Exception("閲囪喘鍏ュ簱鎴栦綑鏂欓��鍥炰笉鍙緭鍏ユ壒娆★紝涓嶅彲缂栬緫!");
+ }
+ }
sqlString += "Insert into BllArrivalNotice (ASNNo,Type,Origin,CustomerNo,";
sqlString += "CustomerName,LotNo,LotText,SupplierLot,CreateUser) values ( ";
@@ -342,6 +351,16 @@
string sqlDetailStr = string.Empty;
try
{
+ //鍒ゆ柇鏄惁涓洪噰璐叆搴撳崟鎹垨杞﹂棿浣欐枡閫�鍥炲叆搴�
+ // 0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 2锛氫腑闂村搧鍏ュ簱 3锛氶��璐у叆搴� 4锛氳溅闂翠綑鏂欓��鍥炲叆搴� 5锛氬叾瀹冨叆搴� 6锛氫唬鍌ㄥ叆搴� 7锛氬瘎瀛樺叆搴�
+ if (model.Type == "1" || model.Type == "4")
+ {
+ if (!string.IsNullOrWhiteSpace(model.LotNo))
+ {
+ strMessage = "-1:閲囪喘鍏ュ簱鎴栦綑鏂欓��鍥炰笉鍙緭鍏ユ壒娆★紝涓嶅彲缂栬緫;";
+ return strMessage;
+ }
+ }
if (model.Origin != "褰曞叆")
{
strMessage = "-1:涓婃父绯荤粺涓嬪彂鐨勫崟鎹紝涓嶅彲缂栬緫;";
@@ -512,9 +531,9 @@
sqlString += $"UpdateTime = GETDATE(),UpdateUser = '{model.CreateUser}' ";
sqlString += $"WHERE ASNNo = '{model.ASNNo}';";
- //鍒ゆ柇鏄惁涓洪噰璐叆搴撳崟鎹�
+ //鍒ゆ柇鏄惁涓洪噰璐叆搴撳崟鎹垨杞﹂棿浣欐枡閫�鍥炲叆搴�
// 0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 2锛氫腑闂村搧鍏ュ簱 3锛氶��璐у叆搴� 4锛氳溅闂翠綑鏂欓��鍥炲叆搴� 5锛氬叾瀹冨叆搴� 6锛氫唬鍌ㄥ叆搴� 7锛氬瘎瀛樺叆搴�
- if (model.Type == "1")
+ if (model.Type == "1" || model.Type == "4")
{
//鑾峰彇鍗曟嵁鐢熸垚瀵瑰簲鏍囩
var list = Db.Queryable<BllBoxInfo>().Where(a => a.IsDel == "0" && a.Status == "0" && a.BindNo == null);
diff --git a/Wms/WMS.BLL/BllAsnServer/AuditLogServer.cs b/Wms/WMS.BLL/BllAsnServer/AuditLogServer.cs
index 26cde9e..0e91896 100644
--- a/Wms/WMS.BLL/BllAsnServer/AuditLogServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/AuditLogServer.cs
@@ -15,7 +15,7 @@
namespace WMS.BLL.BllAsnServer
{
- public class AuditLogServer: DbHelper<BllAuditLog>, IAuditLogServer
+ public class AuditLogServer : DbHelper<BllAuditLog>, IAuditLogServer
{
private static readonly SqlSugarScope Db = DataContext.Db;
@@ -29,22 +29,22 @@
try
{
Expression<Func<BllAuditLog, bool>> item = Expressionable.Create<BllAuditLog>()
- .AndIF(!string.IsNullOrWhiteSpace(model.AsnNo),it=>it.OrderNo.Contains(model.AsnNo.Trim()))
- .AndIF(!string.IsNullOrWhiteSpace(model.Status),it=>it.Status == model.Status)
- .AndIF(!string.IsNullOrWhiteSpace(model.StartTime),it=> it.CreateTime >= Convert.ToDateTime(model.StartTime))
- .AndIF(!string.IsNullOrWhiteSpace(model.EndTime),it=> it.CreateTime <= Convert.ToDateTime(model.EndTime).AddDays(1))
- .And(it=>it.IsDel=="0")
+ .AndIF(!string.IsNullOrWhiteSpace(model.AsnNo), it => it.OrderNo.Contains(model.AsnNo.Trim()))
+ .AndIF(!string.IsNullOrWhiteSpace(model.Status), it => it.Status == model.Status)
+ .AndIF(!string.IsNullOrWhiteSpace(model.StartTime), it => it.CreateTime >= Convert.ToDateTime(model.StartTime))
+ .AndIF(!string.IsNullOrWhiteSpace(model.EndTime), it => it.CreateTime <= Convert.ToDateTime(model.EndTime).AddDays(1))
+ .And(it => it.IsDel == "0")
.ToExpression();
var total = 0;
var data = GetAllWhereAsync(item)
- .LeftJoin<SysUserInfor>((a, b ) => a.CreateUser == b.Id)
+ .LeftJoin<SysUserInfor>((a, b) => a.CreateUser == b.Id)
.LeftJoin<SysUserInfor>((a, b, c) => a.AuditUser == c.Id)
.Select((a, b, c) => new AuditLogDto()
{
Id = a.Id,
OrderNo = a.OrderNo,
PalletNo = a.PalletNo,
-
+
Msg = a.Msg,
Status = a.Status,
Reason = a.Reason,
@@ -68,11 +68,11 @@
}
//缂栬緫瀹℃牳
- public void EditAudit(int id, string status,string opinion,int userId)
+ public void EditAudit(int id, string status, string opinion, int userId)
{
try
{
- var log = Db.Queryable<BllAuditLog>().First(m => m.Id == id && m.IsDel =="0");
+ var log = Db.Queryable<BllAuditLog>().First(m => m.Id == id && m.IsDel == "0");
if (log == null)
{
throw new Exception("鏈煡璇㈠埌瀹℃牳淇℃伅锛岃鏍稿疄");
@@ -156,7 +156,7 @@
.First(m => m.IsDel == "0" && m.LocatNo == item.LocatNo);
if (item.Qty != null)
{
- if (item.LockQty>0)
+ if (item.LockQty > 0)
{
throw new Exception("褰撳墠鐗╂枡鎵规宸茶鍒嗛厤锛屾棤娉曟挙閿�");
}
@@ -197,9 +197,12 @@
{
if (demo2.Origin != "WMS")
{
- demo2.ASNNo = null;
- demo2.ASNDetailNo = null;
- }
+ if (notice.Type != "1" || notice.Type != "4")
+ {
+ demo2.ASNNo = null;
+ demo2.ASNDetailNo = null;
+ }
+ }
demo2.BindNo = null;
demo2.PalletNo = null;
demo2.Status = "0";
@@ -246,7 +249,7 @@
{
Db.Updateable(stock).ExecuteCommand();
}
-
+
}
Db.Deleteable(item).ExecuteCommand();
@@ -404,7 +407,7 @@
if (stockDetail.Qty != null)
{
stock.Qty -= (int)stockDetail.Qty;
-
+
}
if (stock.Qty == 0)
@@ -415,7 +418,7 @@
{
Db.Updateable(stock).ExecuteCommand();
}
-
+
Db.Deleteable(stockDetail).ExecuteCommand();
Db.Deleteable(stockInfo).ExecuteCommand();
if (locate != null)
@@ -435,14 +438,14 @@
bind.TaskNo = "";
bind.CompleteTime = null;
Db.Updateable(bind).ExecuteCommand();
-
+
}
else
{
throw new Exception("璁板綍鐨勫姛鑳界紪鍙峰紓甯�");
}
}
-
+
log.Status = status;
log.Opinion = opinion;
log.AuditTime = DateTime.Now;
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index 472de61..02f2a8d 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -48,7 +48,7 @@
.AndIF(!string.IsNullOrWhiteSpace(model.PalletNo), it => it.PalletNo.Contains(model.PalletNo.Trim()))
.AndIF(!string.IsNullOrWhiteSpace(model.LocatNo), it => it.LocatNo.Contains(model.LocatNo.Trim()))
.AndIF(!string.IsNullOrEmpty(model.RoadwayNo), a => a.RoadwayNo == model.RoadwayNo)
- .AndIF(!string.IsNullOrEmpty(model.WareHouseNo), a => a.RoadwayNo == model.WareHouseNo)
+ .AndIF(!string.IsNullOrEmpty(model.WareHouseNo), a => a.WareHouseNo == model.WareHouseNo)
.AndIF(strList.Count>0, it => strList.Contains((int)it.ASNDetailNo))
.AndIF(!string.IsNullOrWhiteSpace(model.LotNo), it => it.LotNo.Contains(model.LotNo.Trim()))
.AndIF(!string.IsNullOrWhiteSpace(model.LotText), it => it.LotText.Contains(model.LotText.Trim()))
@@ -1150,7 +1150,7 @@
#region 搴撳瓨鏄庣粏
var sd = new DataStockDetail()
{
- LotNo = noticeDetail.LotNo,
+ LotNo = item.LotNo,
LotText = noticeDetail.LotText,
SupplierLot = noticeDetail.SupplierLot,
SkuNo = noticeDetail.SkuNo,
@@ -1263,7 +1263,7 @@
SkuNo = noticeDetail.SkuNo,
SkuName = noticeDetail.SkuName,
Standard = noticeDetail.Standard,
- LotNo = noticeDetail.LotNo,
+ LotNo = item.LotNo,
LotText = noticeDetail.LotText,
Qty = item.Qty,
LockQty = 0,
--
Gitblit v1.8.0