From 56827df8730c172c6c654fb78fed073ef8d694cb Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 23 十月 2025 19:22:39 +0800
Subject: [PATCH] 优化入库单处理
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_ISquareCabinServices/ICabinOrderServices.cs | 2
新建文件夹/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt | 0
新建文件夹/WMS/src/views/inbound/inboundOrderDetail_Hty.vue | 8
新建文件夹/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_CabinOrder_Hty.cs | 78 +---
新建文件夹/PDA/pages/stash/inboundorder.vue | 2
新建文件夹/WIDESEA_WMSServer/WIDESEA_Common/WareHouseEnum/WarehouseEnum.cs | 64 --
新建文件夹/WIDESEA_WMSServer/WIDESEA_Common/MaterielEnum/MaterielSourceTypeEnum.cs | 7
新建文件夹/WMS/src/views/inbound/inboundOrder.vue | 2
项目资料/医药项目系统WMS （上游).xlsx | 0
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs | 4
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs | 689 ++++++++++++--------------------------
新建文件夹/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_CabinOrderDetail_Hty .cs | 70 +--
新建文件夹/PDA/pages/stash/raworderboxing.vue | 103 ++++-
13 files changed, 363 insertions(+), 666 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/inboundorder.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/inboundorder.vue"
index a239815..4592156 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/inboundorder.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/inboundorder.vue"
@@ -69,7 +69,9 @@
this.isLoaded=true;
},
onShow() {
+ this.isLoaded = uni.getStorageSync('isLoaded');
if (this.isLoaded) {
+ uni.removeStorageSync('isLoaded');
// 浠庡叾浠栭〉闈㈣繑鍥炴椂鍒锋柊
this.getData();
}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/raworderboxing.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/raworderboxing.vue"
index 5463f45..e1ac0c7 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/raworderboxing.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/raworderboxing.vue"
@@ -37,7 +37,8 @@
<view style="display: flex;justify-content: space-around;margin-top: 2%;">
<!-- <button @click="reset" type="default" size="default"
style="width: 160rpx;border: 1rpx solid #007aff;color: #007aff;">閲嶇疆</button> -->
- <button @click="submit" type="primary" size="default" style="width: 200rpx;">纭鍏ュ簱</button>
+ <button @click="submit" type="primary" size="default"
+ style="width: 200rpx;">纭鍏ュ簱</button>
</view>
</uni-forms-item>
</uni-forms>
@@ -135,13 +136,13 @@
matTotal: [],
matInfos: [],
orderNo: "",
- batchNo:"",
- orderqty:"",
- Inqty:"",
- goods_no:"",
- batch_num:"",
- order_qty:"",
- order_Inqty:"",
+ batchNo: "",
+ orderqty: 0,
+ Inqty: 0,
+ goods_no: "",
+ batch_num: "",
+ order_qty: "",
+ order_Inqty: "",
label: "",
orderInfo: [],
focus: false,
@@ -174,15 +175,15 @@
this.focus = false;
this.addressFocus = false;
this.orderNo = res.orderNo;
- this.Inqty=res.order_Inqty;
- this.orderqty=res.order_qty;
- this.batchNo=res.batchNo;
+ this.Inqty = res.order_Inqty;
+ this.orderqty = res.order_qty;
+ this.batchNo = res.batchNo;
this.warehouseId = res.warehouseId;
this.label = "鍗曟嵁缂栧彿锛�" + this.orderNo;
- this.batch_num="鎵规鍙凤細"+res.batchNo;
- this.order_qty="鍗曟嵁鏁伴噺锛�"+res.order_qty;
- this.order_Inqty="宸插叆搴撴暟閲忥細"+this.Inqty;
- this.goods_no="鐗╂枡缂栧彿锛�"+res.goods_no;
+ this.batch_num = "鎵规鍙凤細" + res.batchNo;
+ this.order_qty = "鍗曟嵁鏁伴噺锛�" + res.order_qty;
+ this.order_Inqty = "宸插叆搴撴暟閲忥細" + this.Inqty;
+ this.goods_no = "鐗╂枡缂栧彿锛�" + res.goods_no;
this.getData();
},
methods: {
@@ -254,12 +255,12 @@
matSn = matSn.replace(/,SC.*/, '');
}
//鏌ヨmatSn鏄惁瀛樺湪瀛楃
- if(matSn.indexOf("POHA")>0){
+ if (matSn.indexOf("POHA") > 0) {
this.$u.post('/api/MaterielInfo/CodeAnalysis?serNum=' + matSn, {}).then((res) => {
this.Testcheck = false;
if (res.status) {
this.sns.push(res.data.serialNumber);
-
+
this.matInfos.push(res.data);
if (res.message) {
this.$refs.uToast.show({
@@ -294,10 +295,10 @@
pksnInput() {
this.$nextTick(() => {
if (this.pkmaterSn != "") {
-
+
var matSn = this.pkmaterSn;
-
- if(matSn.indexOf("POHA")>0){
+
+ if (matSn.indexOf("POHA") > 0) {
this.$u.post('/api/MaterielInfo/CodeAnalysis?serNum=' + matSn, {}).then((res) => {
if (res.status) {
this.pksns.push(res.data.serialNumber);
@@ -451,6 +452,9 @@
})
return;
}
+ uni.showLoading({
+ title: '鎻愪氦涓�...'
+ });
this.$u.post('/api/CabinOrder/FeedbackIn', {
MainData: {
"LocationCode": this.barcode,
@@ -461,23 +465,74 @@
},
DelKeys: this.sns
}).then(res => {
+ uni.hideLoading();
this.Testcheck = false;
if (res.status) {
this.$refs.uToast.show({
title: "鍏ュ簱鎴愬姛",
type: "success"
})
- this.Inqty=res.message;
- this.order_Inqty="宸插叆搴撴暟閲忥細"+this.Inqty;
- this.barcode="";
- this.materSn="";
+ this.Inqty = parseInt(res.message);
+ this.order_Inqty = "宸插叆搴撴暟閲忥細" + this.Inqty;
+ this.barcode = "";
+ this.materSn = "";
+ if (this.Inqty == this.orderqty) {
+ uni.setStorageSync('isLoaded', true);
+ this.handleInboundComplete();
+ }
} else {
this.$refs.uToast.show({
title: res.message,
type: "error"
})
}
+ }).catch(err => {
+ uni.hideLoading();
+ this.$refs.uToast.show({
+ title: "缃戠粶閿欒锛岃閲嶈瘯",
+ type: "error"
+ })
})
+ },
+ // 鏂板鏂规硶澶勭悊鍏ュ簱瀹屾垚閫昏緫
+ handleInboundComplete() {
+ // 鏄剧ず瀹屾垚鎻愮ず
+ // uni.showModal({
+ // title: '鎻愮ず',
+ // content: '鍏ュ簱宸插畬鎴愶紝鏄惁杩斿洖棣栭〉锛�',
+ // success: (res) => {
+ // if (res.confirm) {
+ // // 鐢ㄦ埛鐐瑰嚮纭畾
+ // setTimeout(() => {
+ // // uni.redirectTo({
+ // // url: '/pages/stash/inboundorder?warehouseId='+this.warehouseId // 鏇挎崲涓轰綘鐨勭洰鏍囬〉闈㈣矾寰�
+ // // });
+ // uni.navigateBack({
+ // delta: 2
+ // });
+ // }, 500);
+ // } else {
+ // // 鐢ㄦ埛鐐瑰嚮鍙栨秷锛屽彲浠ュ仠鐣欏湪褰撳墠椤甸潰
+ // // 鎴栬�呮墽琛屽叾浠栨搷浣�
+ // }
+ // }
+ // });
+
+ // 鎴栬�呯洿鎺ヨ烦杞紙涓嶈闂敤鎴凤級
+ setTimeout(() => {
+ // 鏂瑰紡2锛氳烦杞埌鎸囧畾椤甸潰
+ // uni.redirectTo({
+ // url: '/pages/order/list' // 鏇挎崲涓轰綘鐨勭洰鏍囬〉闈㈣矾寰�
+ // });
+ // 鏂瑰紡3锛氳烦杞埌棣栭〉
+ // uni.switchTab({
+ // url: '/pages/index/index'
+ // });
+ // 鏂瑰紡1锛氫娇鐢╱ni.navigateBack杩斿洖涓婁竴椤�
+ uni.navigateBack({
+ delta: 2
+ });
+ }, 600);
}
}
}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt"
index f1d8a36..233025e 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt"
Binary files differ
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Common/MaterielEnum/MaterielSourceTypeEnum.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Common/MaterielEnum/MaterielSourceTypeEnum.cs"
index 5080c36..f881996 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Common/MaterielEnum/MaterielSourceTypeEnum.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Common/MaterielEnum/MaterielSourceTypeEnum.cs"
@@ -16,11 +16,6 @@
/// <summary>
/// 灏忎欢
/// </summary>
- SelfMadePart = 2,
-
- /// <summary>
- /// 閲囪喘&鑷埗浠�
- /// </summary>
- PurchaseAndSelf = 3
+ SelfMadePart = 2
}
}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Common/WareHouseEnum/WarehouseEnum.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Common/WareHouseEnum/WarehouseEnum.cs"
index 7685dce..94de290 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Common/WareHouseEnum/WarehouseEnum.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Common/WareHouseEnum/WarehouseEnum.cs"
@@ -9,68 +9,28 @@
{
/// <summary>
/// 浠撳簱
- /// HA57 = 娣畨浜屽巶 - 鏉挎枡浠�<br/>
- /// HA58 = 娣畨浜屽巶 - PP浠�<br/>
- /// HA60 = 娣畨浜屽巶 - 杈呮枡浠�<br/>
- /// HA64 = 娣畨浜屽巶 - 娴嬭瘯鏋朵粨<br/>
- /// HA71 = 娣畨浜屽巶 - 鎴愬搧浠�<br/>
- /// HA72 = 娣畨浜屽巶 - 灏炬暟浠�<br/>
- /// HA73 = 娣畨浜屽巶 - 鐮斿彂浠�<br/>
- /// HA101 = 娣畨浜屽巶 - 鎴愬搧浠撳钩搴�<br/>
- /// HA152 = 娣畨浜屽巶 - 骞茶啘浠�<br/>
- /// HA153 = 娣畨浜屽巶 - 娌瑰ⅷ浠�<br/>
/// </summary>
public enum WarehouseEnum
{
/// <summary>
- /// 鏉挎枡浠�
+ /// 鏅鸿兘绔嬪簱
/// </summary>
- [Description("鏉挎枡浠�")]
- HA57,
+ [Description("鏅鸿兘绔嬪簱")]
+ 绔嬪簱 = 1,
/// <summary>
- /// PP浠�
+ /// 澶т欢搴�
/// </summary>
- [Description("PP浠�")]
- HA58,
+ [Description("澶т欢搴�")]
+ 澶т欢搴�,
/// <summary>
- /// 杈呮枡浠�
+ /// 楹荤簿搴�
/// </summary>
- [Description("杈呮枡浠�")]
- HA60,
+ [Description("楹荤簿搴�")]
+ 楹荤簿搴�,
/// <summary>
- /// 娴嬭瘯鏋朵粨
+ /// 鍐峰喕搴�
/// </summary>
- [Description("娴嬭瘯鏋朵粨")]
- HA64,
- /// <summary>
- /// 鎴愬搧浠�
- /// </summary>
- [Description("鎴愬搧浠�")]
- HA71,
- /// <summary>
- /// 灏炬暟浠�
- /// </summary>
- [Description("灏炬暟浠�")]
- HA72,
- /// <summary>
- /// 鐮斿彂浠�
- /// </summary>
- [Description("鐮斿彂浠�")]
- HA73,
- /// <summary>
- /// 鎴愬搧浠撳钩搴�
- /// </summary>
- [Description("鎴愬搧浠撳钩搴�")]
- HA101,
- /// <summary>
- /// 骞茶啘浠�
- /// </summary>
- [Description("骞茶啘浠�")]
- HA152,
- /// <summary>
- /// 娌瑰ⅷ浠�
- /// </summary>
- [Description("娌瑰ⅷ浠�")]
- HA153
+ [Description("鍐峰喕搴�")]
+ 鍐峰喕搴� = 10
}
}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_ISquareCabinServices/ICabinOrderServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_ISquareCabinServices/ICabinOrderServices.cs"
index ad2dffc..04f81d8 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_ISquareCabinServices/ICabinOrderServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_ISquareCabinServices/ICabinOrderServices.cs"
@@ -19,8 +19,6 @@
/// <returns></returns>
WebResponseContent GetUpstreamOrder();
- WebResponseContent GetUpstreamOrder2();
-
/// <summary>
/// 鍏ュ簱鎶ュ畬鎴愭帴鍙�
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_CabinOrderDetail_Hty .cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_CabinOrderDetail_Hty .cs"
index c76e564..14bd9e6 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_CabinOrderDetail_Hty .cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_CabinOrderDetail_Hty .cs"
@@ -1,4 +1,5 @@
-锘縰sing SqlSugar;
+锘縰sing Magicodes.ExporterAndImporter.Core;
+using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -9,57 +10,30 @@
namespace WIDESEA_Model.Models
{
[SugarTable("Dt_CabinOrderDetail_Hty ", "鍏ュ簱鏄庣粏鍘嗗彶琛�")]
- public class Dt_CabinOrderDetail_Hty : BaseEntity
+ public class Dt_CabinOrderDetail_Hty : Dt_CabinOrderDetail, IBaseHistoryEntity
{
-
- [SugarColumn(ColumnName = "HistoryId", IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "鍘嗗彶璁板綍涓婚敭")]
- public int HistoryId { get; set; }
- // 淇濈暀鍘熻〃鎵�鏈夊瓧娈�
- [SugarColumn(ColumnName = "Id", ColumnDescription = "鍘熶富閿�")]
- public int Id { get; set; }
-
- //鍖哄煙锛堣嚜宸卞缓绔嬫垨鑰呬粬浠洿鎺ョ粰鍑烘潵锛�
- [SugarColumn(ColumnName = "Reservoirarea", IsNullable = true, Length = 50, ColumnDescription = "搴撳尯")]
- public string Reservoirarea { get; set; }
-
- [SugarColumn(ColumnName = "Goods_no", IsNullable = true, Length = 50, ColumnDescription = "鑽搧缂栫爜")]
- public string Goods_no { get; set; }
-
- [SugarColumn(ColumnName = "Order_qty", IsNullable = true, ColumnDescription = "璁㈠崟鍏ュ簱鏁伴噺锛岄��璐ф椂涓鸿礋鏁�")]
- public decimal Order_qty { get; set; }
-
- [SugarColumn(ColumnName = "Order_Inqty", IsNullable = true, ColumnDescription = "鍏ュ簱瀹屾垚鏁伴噺")]
- public decimal Order_Inqty { get; set; }
-
-
-
- [SugarColumn(ColumnName = "Batch_num", IsNullable = true, Length = 50, ColumnDescription = "鎵瑰彿")]
- public string Batch_num { get; set; }
-
- [SugarColumn(ColumnName = "Exp_date", IsNullable = true, Length = 50, ColumnDescription = "鏍℃湡(yyyymmmdd)")]
- public string Exp_date { get; set; }
-
-
-
- //鐩樼泩鏄庣粏--銆嬫枡绠卞彿锛屾暟閲�
- //public List<> StocktakingDetails { get; set; }
-
+ /// <summary>
+ /// 鍘熻〃涓婚敭
+ /// </summary>
+ [ImporterHeader(Name = "鍘熻〃涓婚敭")]
+ [ExporterHeader(DisplayName = "鍘熻〃涓婚敭")]
+ [SugarColumn(IsNullable = false, DefaultValue = "0", ColumnDescription = "鍘熻〃涓婚敭")]
+ public int SourceId { get; set; }
/// <summary>
- /// 璁㈠崟璇︽儏鐘舵�� 鏂板缓锛屽紑濮嬶紝宸插畬鎴�
- /// 搴撴埧鍙�+鐘舵��+锛堟柊寤猴級锛氬垽鏂槸鍚︿笅鍙戠粰wcs
- /// 璇︽儏寮�濮嬶紙寮�濮嬶級
- /// 璇︽儏瀹屾垚锛堝凡瀹屾垚锛岀Щ鍏ュ巻鍙茶〃鍒犻櫎淇℃伅锛�
+ /// 鎿嶄綔绫诲瀷
/// </summary>
- [SugarColumn(ColumnName = "OrderDetailStatus", IsNullable = true, Length = 50, ColumnDescription = "鐘舵��")]
- public string OrderDetailStatus { get; set; }
+ [ImporterHeader(Name = "鎿嶄綔绫诲瀷")]
+ [ExporterHeader(DisplayName = "鎿嶄綔绫诲瀷")]
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎿嶄綔绫诲瀷")]
+ public string OperateType { get; set; }
- //鐘舵��
- [SugarColumn(ColumnName = "Status", IsNullable = true, ColumnDescription = "鐘舵�� 鍚屾鐘舵�侊細0鏈悓姝� 1宸插悓姝� 2鏃犻渶鍚屾锛堝嵆鍚屾涓嬪彂缁檞cs锛�")]
- public int Status { get; set; }
-
- // 淇瀵艰埅灞炴�э細浣跨敤 Goods_no 鍏宠仈 MaterielCode
- [Navigate(NavigateType.OneToOne, nameof(Goods_no), nameof(Dt_MaterielInfo.MaterielCode))]
- public Dt_MaterielInfo MedicineGoods { get; set; }
+ /// <summary>
+ /// 绉诲叆鍘嗗彶鏃堕棿
+ /// </summary>
+ [ImporterHeader(Name = "绉诲叆鍘嗗彶鏃堕棿")]
+ [ExporterHeader(DisplayName = "绉诲叆鍘嗗彶鏃堕棿")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "绉诲叆鍘嗗彶鏃堕棿")]
+ public DateTime InsertTime { get; set; }
}
}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_CabinOrder_Hty.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_CabinOrder_Hty.cs"
index 6d02591..40c9644 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_CabinOrder_Hty.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_CabinOrder_Hty.cs"
@@ -1,4 +1,5 @@
-锘縰sing SqlSugar;
+锘縰sing Magicodes.ExporterAndImporter.Core;
+using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -10,63 +11,32 @@
{
[SugarTable("Dt_CabinOrder_Hty", "鍏ュ簱鍗曡〃鍘嗗彶琛�")]
- public class Dt_CabinOrder_Hty : BaseEntity
+ public class Dt_CabinOrder_Hty : Dt_CabinOrder,IBaseHistoryEntity
{
-
- [SugarColumn(ColumnName = "HistoryId", IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "鍘嗗彶璁板綍涓婚敭")]
- public int HistoryId { get; set; }
-
-
- [SugarColumn(ColumnName = "Id", ColumnDescription = "鍘熶富閿�")]
- public int Id { get; set; }
-
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鍏ュ簱鍗曞彿")]
- public string Order_no { get; set; }
-
-
- [SugarColumn(IsNullable = true, Length = 3, ColumnDescription = "鍏ュ簱绫诲瀷锛�1姝ｅ父/3閫�璐�")]
- public string Order_type { get; set; }
-
-
-
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "渚涘簲鍟嗕唬鐮�")]
- public string Supplier_no { get; set; }
-
-
- [SugarColumn(IsNullable = true, Length = 100, ColumnDescription = "渚涘簲鍟嗗悕绉�")]
- public string Supplier_name { get; set; }
-
-
- //搴撴埧鍙�
- [SugarColumn(ColumnName = "Warehouse_no", IsNullable = true, ColumnDescription = "搴撴埧鍙�001")]
- public string Warehouse_no { get; set; }
-
- [SugarColumn(IsNullable = true, ColumnDescription = "鍏ュ簱璁拌处鏃堕棿")]
- public DateTime? Account_tiem { get; set; }
+ [Navigate(NavigateType.OneToMany, nameof(Dt_CabinOrderDetail_Hty.OrderId))]
+ public new List<Dt_CabinOrderDetail_Hty> Details { get; set; }
+ /// <summary>
+ /// 鍘熻〃涓婚敭
+ /// </summary>
+ [ImporterHeader(Name = "鍘熻〃涓婚敭")]
+ [ExporterHeader(DisplayName = "鍘熻〃涓婚敭")]
+ [SugarColumn(IsNullable = false, DefaultValue = "0", ColumnDescription = "鍘熻〃涓婚敭")]
+ public int SourceId { get; set; }
/// <summary>
- /// 涓嬫父鐘舵�� 鏂板缓锛屽紑濮嬶紝宸插畬鎴�
- /// 涓嬫父涓嬪彂锛堟柊寤猴級
- /// 璇︽儏寮�濮嬶紙寮�濮嬶級
- /// 璇︽儏鍏ㄩ儴瀹屾垚锛堝凡瀹屾垚锛屼笂浼犵粰涓婃父绯荤粺锛岀Щ鍏ュ巻鍙茶〃鍒犻櫎淇℃伅锛�
+ /// 鎿嶄綔绫诲瀷
/// </summary>
- [SugarColumn(ColumnName = "OdrderStatus", IsNullable = true, Length = 50, ColumnDescription = "琛ㄥご鐘舵��")]
- public string OdrderStatus { get; set; }
+ [ImporterHeader(Name = "鎿嶄綔绫诲瀷")]
+ [ExporterHeader(DisplayName = "鎿嶄綔绫诲瀷")]
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎿嶄綔绫诲瀷")]
+ public string OperateType { get; set; }
- //涓嬮潰鏄惁闇�瑕佽繖浜涘瓧娈碉紵
- //浼樺厛绾� priority
- //[SugarColumn(ColumnName ="Priority",IsNullable =true,ColumnDescription ="浼樺厛绾�")]
- //public int Priority { get; set; }
-
-
-
- //鏄惁鍙栨秷 Iscancel
- //[SugarColumn(ColumnName = "Iscancel", IsNullable = true, ColumnDescription = "鏄惁鍙栨秷(1鏄�0鍚�)")]
- //public int Iscancel { get; set; }
-
- [Navigate(NavigateType.OneToMany, nameof(Dt_CabinOrderDetail.OrderId))]
- public List<Dt_CabinOrderDetail> Details { get; set; }
-
-
+ /// <summary>
+ /// 绉诲叆鍘嗗彶鏃堕棿
+ /// </summary>
+ [ImporterHeader(Name = "绉诲叆鍘嗗彶鏃堕棿")]
+ [ExporterHeader(DisplayName = "绉诲叆鍘嗗彶鏃堕棿")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "绉诲叆鍘嗗彶鏃堕棿")]
+ public DateTime InsertTime { get; set; }
}
}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
index e8caa77..f24f1aa 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
@@ -13,11 +13,13 @@
using WIDESEA_Common.OrderEnum;
using WIDESEA_Common.StockEnum;
using WIDESEA_Common.TaskEnum;
+using WIDESEA_Common.WareHouseEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
+using WIDESEA_DTO.SquareCabin;
using WIDESEA_IBasicService;
using WIDESEA_ISquareCabinServices;
using WIDESEA_IWMsInfoServices;
@@ -32,7 +34,6 @@
{
public class CabinOrderServices : ServiceBase<Dt_CabinOrder, IRepository<Dt_CabinOrder>>, ICabinOrderServices
{
- static string SearchDate = "";
private readonly IBasicService _basicService;
private readonly IMedicineGoodsServices _medicineGoodsServices;
private readonly IUnitOfWorkManage _unitOfWorkManage;
@@ -40,9 +41,10 @@
private readonly IInventoryInfoService _inventoryInfoService;
private readonly ICabinOrderDetailServices _cabinOrderDetailServices;
private readonly ISupplyTaskService _supplyTaskService;
+ private readonly ISupplyTaskHtyService _supplyTaskHtyService;
public IRepository<Dt_CabinOrder> Repository => BaseDal;
- public CabinOrderServices(IRepository<Dt_CabinOrder> BaseDal, IBasicService basicService, IMedicineGoodsServices medicineGoodsServices, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, ICabinOrderDetailServices cabinOrderDetailServices, ICabinOrderHtyServices cabinOrderHtyServices, ICabinOrderDetailHtyServices cabinOrderDetailHtyServices, ISupplyTaskService supplyTaskService) : base(BaseDal)
+ public CabinOrderServices(IRepository<Dt_CabinOrder> BaseDal, IBasicService basicService, IMedicineGoodsServices medicineGoodsServices, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, ICabinOrderDetailServices cabinOrderDetailServices, ICabinOrderHtyServices cabinOrderHtyServices, ICabinOrderDetailHtyServices cabinOrderDetailHtyServices, ISupplyTaskService supplyTaskService, ISupplyTaskHtyService supplyTaskHtyService) : base(BaseDal)
{
_basicService = basicService;
_medicineGoodsServices = medicineGoodsServices;
@@ -51,6 +53,7 @@
_inventoryInfoService = inventoryInfoService;
_cabinOrderDetailServices = cabinOrderDetailServices;
_supplyTaskService = supplyTaskService;
+ _supplyTaskHtyService = supplyTaskHtyService;
}
@@ -98,7 +101,7 @@
{
WebResponseContent content = new WebResponseContent();
Dt_CabinOrder cabinOrder = Db.Queryable<Dt_CabinOrder>().Includes(x => x.Details).First(x => x.Order_no == orderNo);
- List<Dt_CabinOrderDetail> cabinOrderDetails = cabinOrder.Details.Where(x => x.Status == 2).ToList();
+ List<Dt_CabinOrderDetail> cabinOrderDetails = cabinOrder.Details.Where(x => x.Status == 2 && x.OrderDetailStatus != "宸插畬鎴�").ToList();
content.OK(data: cabinOrderDetails);
return content;
}
@@ -120,10 +123,11 @@
var Inqty = saveModel.MainData["Inqty"].ObjToInt();
var warehouseCode = saveModel.MainData["warehouseCode"].ToString();
Dt_CabinOrder cabinOrder = BaseDal.Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == orderNo && x.Warehouse_no == warehouseCode).Includes(x => x.Details).First();
- if (cabinOrder == null) return WebResponseContent.Instance.Error($"鍏ュ簱鍗曞凡瀹屾垚");
- //Dt_CabinOrderDetail cabinOrderDetail = cabinOrder.Details.Where(x => x.Batch_num == batchNo && x.Reservoirarea == warehouseCode).First();
+ if (cabinOrder == null || cabinOrder.OdrderStatus == "宸插畬鎴�")
+ return WebResponseContent.Instance.Error($"鍏ュ簱鍗曞凡瀹屾垚");
Dt_CabinOrderDetail cabinOrderDetail = cabinOrder.Details.Where(x => x.Batch_num == batchNo && x.Status == 2).First();
- if (cabinOrderDetail == null) return WebResponseContent.Instance.Error($"鍏ュ簱鍗曟槑缁嗗凡瀹屾垚");
+ if (cabinOrderDetail == null || cabinOrderDetail.OrderDetailStatus == "宸插畬鎴�")
+ return WebResponseContent.Instance.Error($"鍏ュ簱鍗曟槑缁嗗凡瀹屾垚");
Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == cabinOrderDetail.Goods_no);
if (materielInfo == null) return WebResponseContent.Instance.Error($"璇风淮鎶ょ墿鏂欑紪鍙枫�恵cabinOrderDetail.Goods_no}銆戠殑鐗╂枡淇℃伅");
cabinOrderDetail.Order_Inqty += Inqty;
@@ -141,39 +145,27 @@
cabinOrderDetail.OrderDetailStatus = "宸插畬鎴�";
//_cabinOrderDetailServices.Repository.DeleteAndMoveIntoHty(cabinOrderDetail, OperateTypeEnum.鑷姩瀹屾垚);
- Dt_CabinOrderDetail_Hty hty = new Dt_CabinOrderDetail_Hty
- {
- Id = cabinOrderDetail.OrderId,
- Reservoirarea = cabinOrderDetail.Reservoirarea,
- Goods_no = cabinOrderDetail.Goods_no,
- Order_qty = cabinOrderDetail.Order_qty,
- Order_Inqty = cabinOrderDetail.Order_Inqty,
- Batch_num = cabinOrderDetail.Batch_num,
- Exp_date = cabinOrderDetail.Exp_date,
- OrderDetailStatus = cabinOrderDetail.OrderDetailStatus,
- Status = cabinOrderDetail.Status,
- Creater = cabinOrderDetail.Creater,
- CreateDate = cabinOrderDetail.CreateDate,
- Modifier = App.User.UserName,
- ModifyDate = DateTime.Now
- };
- var i = BaseDal.Db.Insertable(hty).ExecuteCommand();
- if (i<0)
- {
- _unitOfWorkManage.RollbackTran();
- }
- var v = BaseDal.Db.Deleteable<Dt_CabinOrderDetail>(cabinOrderDetail).ExecuteCommand();
- if (v < 0)
- {
- _unitOfWorkManage.RollbackTran();
- }
+ //Dt_CabinOrderDetail_Hty hty = new Dt_CabinOrderDetail_Hty
+ //{
+ // Id = cabinOrderDetail.OrderId,
+ // Reservoirarea = cabinOrderDetail.Reservoirarea,
+ // Goods_no = cabinOrderDetail.Goods_no,
+ // Order_qty = cabinOrderDetail.Order_qty,
+ // Order_Inqty = cabinOrderDetail.Order_Inqty,
+ // Batch_num = cabinOrderDetail.Batch_num,
+ // Exp_date = cabinOrderDetail.Exp_date,
+ // OrderDetailStatus = cabinOrderDetail.OrderDetailStatus,
+ // Status = cabinOrderDetail.Status,
+ // Creater = cabinOrderDetail.Creater,
+ // CreateDate = cabinOrderDetail.CreateDate,
+ // Modifier = App.User.UserName,
+ // ModifyDate = DateTime.Now
+ //};
+ //var i = BaseDal.Db.Insertable(hty).ExecuteCommand();
}
- else
- {
- _cabinOrderDetailServices.Repository.UpdateData(cabinOrderDetail);
- }
+ _cabinOrderDetailServices.Repository.UpdateData(cabinOrderDetail);
var cabinOrder1 = BaseDal.Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == cabinOrder.Order_no).Includes(x => x.Details).First();
- if (cabinOrder1.Details == null || cabinOrder1.Details.Count < 1) cabinOrder.OdrderStatus = "宸插畬鎴�";
+ if (!cabinOrder1.Details.Where(x => x.OrderDetailStatus != "宸插畬鎴�").Any()) cabinOrder.OdrderStatus = "宸插畬鎴�";
Repository.UpdateData(cabinOrder);
#endregion
@@ -182,7 +174,7 @@
if (location == null) return WebResponseContent.Instance.Error($"璇风淮鎶よ揣浣嶇紪鍙枫�恵LocationCode}銆戠殑璐т綅淇℃伅");
if (location.EnableStatus == EnableStatusEnum.Disable.ObjToInt())
return WebResponseContent.Instance.Error($"璐т綅缂栧彿銆恵LocationCode}銆戝凡绂佺敤锛岃鎭㈠姝ｅ父鍐嶄娇鐢�");
- if (location.LocationStatus != LocationStatusEnum.InStock.ObjToInt())
+ if (location.LocationStatus == LocationStatusEnum.Free.ObjToInt())
{
location.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
_basicService.LocationInfoService.UpdateData(location);
@@ -194,6 +186,7 @@
if (inventoryInfo != null)
{
inventoryInfo.StockQuantity += Inqty;
+ inventoryInfo.AvailableQuantity += Inqty;
_inventoryInfoService.UpdateData(inventoryInfo);
}
else
@@ -206,6 +199,7 @@
MaterielSpec = materielInfo.MaterielSpec,
OutboundQuantity = 0,
StockQuantity = Inqty,
+ AvailableQuantity = Inqty,
StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt(),
ValidityPeriod = cabinOrderDetail.Exp_date,
WarehouseCode = cabinOrderDetail.Reservoirarea,
@@ -220,10 +214,33 @@
#endregion
#region 浠诲姟璁板綍
- Dt_SupplyTask supplyTask = new Dt_SupplyTask()
+ #region MyRegion
+ //Dt_SupplyTask supplyTask = new Dt_SupplyTask()
+ //{
+ // WarehouseCode = cabinOrderDetail.Reservoirarea,
+ // TaskNum = cabinOrderDetail.Id,
+ // TaskStatus = SupplyStatusEnum.InFinish.ObjToInt(),
+ // BatchNo = inventoryInfo.BatchNo,
+ // MaterielName = inventoryInfo.MaterielName,
+ // MaterielCode = inventoryInfo.MaterielCode,
+ // MaterielSpec = inventoryInfo.MaterielSpec,
+ // TaskType = TaskTypeEnum.InPick.ObjToInt(),
+ // CreateDate = DateTime.Now,
+ // Creater = App.User.UserName,
+ // LocationCode = location.LocationCode,
+ // OrderNo = cabinOrder.Order_no,
+ // StockQuantity = Inqty,
+ // SupplyQuantity = 0,
+ // Remark = "鍏ュ簱"
+ //};
+ //_supplyTaskService.AddData(supplyTask);
+ #endregion
+ Dt_SupplyTask_Hty supplyTask_Hty = new Dt_SupplyTask_Hty()
{
WarehouseCode = cabinOrderDetail.Reservoirarea,
TaskNum = cabinOrderDetail.Id,
+ OperateType = OperateTypeEnum.浜哄伐瀹屾垚.ToString(),
+ InsertTime = DateTime.Now,
TaskStatus = SupplyStatusEnum.InFinish.ObjToInt(),
BatchNo = inventoryInfo.BatchNo,
MaterielName = inventoryInfo.MaterielName,
@@ -238,7 +255,7 @@
SupplyQuantity = 0,
Remark = "鍏ュ簱"
};
- _supplyTaskService.AddData(supplyTask);
+ _supplyTaskHtyService.AddData(supplyTask_Hty);
#endregion
#region 搴撳瓨鎵规
@@ -246,6 +263,7 @@
if (inventory_Batch != null)
{
inventory_Batch.StockQuantity += Inqty;
+ inventory_Batch.AvailableQuantity += Inqty;
_inventory_BatchServices.UpdateData(inventory_Batch);
}
else
@@ -263,6 +281,7 @@
ProductionDate = inventoryInfo.ProductionDate,
Status = false,
StockQuantity = inventoryInfo.StockQuantity,
+ AvailableQuantity = inventoryInfo.StockQuantity,
ValidityPeriod = inventoryInfo.ValidityPeriod,
SupplyQuantity = inventoryInfo.SupplyQuantity,
};
@@ -282,10 +301,7 @@
}
return content;
}
-
-
-
-
+ static string SearchDate = "2025-10-10 00:00:00";
/// <summary>
/// 鑾峰彇涓婃父绯荤粺鐨勫叆搴撳崟
/// </summary>
@@ -351,185 +367,20 @@
{
if (order.order_type == "1") //姝ｅ父鍏ュ簱
{
-
+ responseContent = CreateInboundOrder(order);
+ List<Dt_CabinOrder>? dt_CabinOrders = responseContent.Data as List<Dt_CabinOrder>;
+ if (dt_CabinOrders != null) _CabinOrders.AddRange(dt_CabinOrders);
}
else
{
//鍒涘缓鍑哄簱鍗�
- }
- #region 鍒涘缓涓�涓叆搴撳崟鏂规硶
- //鎺掗櫎鐗规畩鑽搧
- bool skipOrder = false;//鏍囪鏄惁璺宠繃璇ュ叆搴撳崟
- if (order.warehouse_no != "001" && (order.warehouse_no == "010" || order.warehouse_no == "003" || order.warehouse_no == "017"))//鐗规畩鑽搧搴撴埧鍙疯繘琛屼笅闈㈡搷浣�
- {
- //鍒涘缓鍏ュ簱鍗曚富琛ㄤ粠琛�
- var entityOrder = new Dt_CabinOrder
- {
- Order_no = order.order_no,
- //鍏ュ簱鍗曠被鍨�
- Order_type = order.order_type,
- Supplier_no = order.supplier_no,
- Account_tiem = order.account_time,
- OdrderStatus = "鏂板缓",
- Supplier_name = order.supplier_name,
- Warehouse_no = order.warehouse_no,
- Details = order.details.Select(d => new Dt_CabinOrderDetail
- {
- //OrderId 瑕佹嬁鍒板叆搴撳崟琛ㄤ腑鐨刬d锛屽浣曟嬁涓嶅埌灏卞皢杩欎釜瀛楁鏀逛簡锛屾敼鎴愬叆搴撳崟鍙�
- // SqlSugar InsertNav宸ヤ綔鍘熺悊鍏堟彃鍏ヤ富琛� (Dt_CabinOrder)//鑾峰彇鐢熸垚鐨勪富閿甀D//鑷姩璁剧疆瀛愯〃鐨勫叧鑱斿瓧娈� (OrderId)//鍐嶆彃鍏�(Dt_CabinOrderDetail)
- Goods_no = d.goods_no,
- Order_qty = d.order_qty,
- Batch_num = d.batch_num,
- Exp_date = d.exp_date,
- OrderDetailStatus = "鏂板缓",
- Status = 2, //濡傛灉鏄�001鎴块偅涔堝氨鏄湭鍚屾鐘舵�侊紝濡傛灉涓嶆槸001鎴块偅涔堝氨鏄棤闇�鍚屾鐘舵��
- }).ToList()
- };
- _CabinOrders.Add(entityOrder);
- }
- else
- {
- //鍖哄垎骞冲簱绔嬪簱
- var entityOrder = new Dt_CabinOrder
- {
- Order_no = order.order_no,
- //鍏ュ簱鍗曠被鍨�
- Order_type = order.order_type,
- Supplier_no = order.supplier_no,
- Account_tiem = order.account_time,
- OdrderStatus = "鏂板缓",
- Supplier_name = order.supplier_name,
- Warehouse_no = order.warehouse_no,
- Details = new List<Dt_CabinOrderDetail>()
- };
- foreach (var item in order.details)
- {
- // 灏嗕笂娓稿叆搴撴暟閲忚浆涓烘鏁�
- item.order_qty = Math.Abs(item.order_qty);
- #region 鏍规嵁鐗╂枡缂栫爜鏌ヨ鐗╂枡淇℃伅
- Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == item.goods_no);
- //濡傛灉鐗╂枡淇℃伅涓嶅瓨鍦紝璺宠繃鏁翠釜鍏ュ簱鍗�
- if (materielInfo == null)
- {
- skipOrder = true;
- Console.WriteLine($"璺宠繃鍏ュ簱鍗� {order.order_no}锛屽師鍥狅細鏈壘鍒板晢鍝� [{item.goods_no}] 鐨勭墿鏂欎俊鎭��");
- break;
- }
- // 鑻ョ墿鏂欎笉瀛樺湪鎴� MaterielSourceType 涓虹┖锛屽垯璺宠繃鏁翠釜鍏ュ簱鍗�
- if (materielInfo == null || !Enum.IsDefined(typeof(MaterielSourceTypeEnum), materielInfo.MaterielSourceType))
- {
- skipOrder = true;
- break;
- }
- //Dt_MedicineGoods materielInfo = BaseDal.Db.Queryable<Dt_MedicineGoods>().Where(x => x.Goods_no == item.goods_no).First();
- ///鏍规嵁鐗╂枡淇℃伅澶у皬浠跺睘鎬у尯鍒嗘槸鍚﹀叆绔嬪簱 //澶т欢鍏ュ钩搴�
- if (materielInfo.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart)//濡傛灉鐗╂枡鏄ぇ浠�
- {
- Dt_CabinOrderDetail orderDetail = new Dt_CabinOrderDetail()
- {
- Reservoirarea = order.warehouse_no,
- Goods_no = item.goods_no,
- Order_qty = item.order_qty,
- Batch_num = item.batch_num,
- Exp_date = item.exp_date,
- OrderDetailStatus = "鏂板缓",
- Status = 2
- };
- entityOrder.Details.Add(orderDetail);
- }
- else
- {
- Dt_CabinOrderDetail orderDetail = null;
- var ys = item.order_qty % materielInfo.BoxQty; //涓嶈兘鏁撮櫎绠辫鐨勬暎浠舵暟
- //var xs = item.order_qty / materielInfo.BoxQty;//鏁寸鏁伴噺
- var xs = (int)(item.order_qty / materielInfo.BoxQty);//淇濈暀鏁存暟
- #region 鐢熸垚绔嬪簱鍏ュ簱鍗�
-
- #region 鍒ゆ柇鏄惁鏈夋暎浠�
- if (ys > 0)
- {
- orderDetail = new Dt_CabinOrderDetail()
- {
- Reservoirarea = order.warehouse_no,
- Goods_no = item.goods_no,
- Order_qty = ys,
- Batch_num = item.batch_num,
- Exp_date = item.exp_date,
- OrderDetailStatus = "鏂板缓",
- Status = 0
- };
- materielInfo.Business_qty += ys;
- }
- #endregion
-
- #region 鍒ゆ柇绔嬪簱搴撳瓨鏄惁澶т簬绔嬪簱鏈�浣庡簱瀛樻暟
- while (materielInfo.Business_qty < materielInfo.MinQty && xs > 0) //褰撲笟鍔℃暟閲忓拰鏁寸鏁伴兘澶т簬0鐨勬椂鍊欐墠浼氬仠姝㈠惊鐜�
- {
- xs--;
- if (orderDetail == null)
- {
- orderDetail = new Dt_CabinOrderDetail()
- {
- Reservoirarea = order.warehouse_no,
- Goods_no = item.goods_no,
- Order_qty = materielInfo.BoxQty,
- Batch_num = item.batch_num,
- Exp_date = item.exp_date,
- OrderDetailStatus = "鏂板缓",
- Status = 0
- };
- materielInfo.Business_qty += materielInfo.BoxQty;
- }
- else
- {
- orderDetail.Order_qty += materielInfo.BoxQty;
- materielInfo.Business_qty += materielInfo.BoxQty;
- }
- }
-
- if (orderDetail != null) entityOrder.Details.Add(orderDetail);
- #endregion
-
-
- #endregion
-
- #region 鍓╀綑鏁翠欢鍏ュ钩搴�
- if (xs > 0)
- {
- orderDetail = new Dt_CabinOrderDetail()
- {
- Reservoirarea = order.warehouse_no,
- Goods_no = item.goods_no,
- Order_qty = materielInfo.BoxQty * xs,
- Batch_num = item.batch_num,
- Exp_date = item.exp_date,
- OrderDetailStatus = "鏂板缓",
- Status = 2
- };
- entityOrder.Details.Add(orderDetail);
- }
- #endregion
- }
- _basicService.MaterielInfoService.Repository.UpdateData(materielInfo);
- //_medicineGoodsServices.Db.Updateable(materielInfo).ExecuteCommand();
- #endregion
- }
- #endregion
- // 鉂楀鏋滆烦杩囪鍗曪紝鍒欑洿鎺ontinue锛屼笉淇濆瓨
- if (skipOrder)
- {
- Console.WriteLine($"璺宠繃鍏ュ簱鍗� {order.order_no}锛屽洜涓哄瓨鍦ㄦ湭瀹氫箟鐗╂枡灞炴�х殑鍟嗗搧銆�");
- continue;
- }
- _CabinOrders.Add(entityOrder);
- orderNos.Add(order.order_no);
}
};
BaseDal.Db.InsertNav(_CabinOrders).Include(x => x.Details).ExecuteCommand();
//鍦ㄤ笅鍙戠粰wcs
- //EdiIn(); //鍙戠粰涓嬫父
+ //EdiIn(); //鍙戠粰涓嬫父
//濡傛灉杩欎釜鏂规硶鎴愬姛浜嗭紝閭ｄ箞灏辫皟鐢–ompleteOrder鎺ュ彛锛岀劧鍚庢敼鍙�
Db.Ado.CommitTran();
return responseContent.OK("鍚屾鍏ュ簱鍗曟垚鍔�");
@@ -549,213 +400,176 @@
}
}
+
+ #region 鍒涘缓鍏ュ簱鍗�
/// <summary>
- /// 瀵规病鏈夎繘琛岀淮鎶ゅ晢鍝佷俊鎭〃鐨勫叆搴撳崟杩涜杩囨护澶勭悊
+ /// 鍒涘缓鍏ュ簱鍗�,杩斿洖涓�涓叆搴撳崟闆嗗悎鍒癲ata
/// </summary>
- /// <returns></returns>
- public WebResponseContent GetUpstreamOrder2()
+ public WebResponseContent CreateInboundOrder(UpstreamOrderInfo order)
{
- var responseContent = new WebResponseContent();
+ WebResponseContent webResponseContent = new WebResponseContent();
try
{
- // 璇锋眰鍦板潃
- var url = "http://121.37.118.63:80/GYZ2/95fck/inOrder";
- //if (string.IsNullOrEmpty(SearchDate)) SearchDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
- //// 璇锋眰鍙傛暟
- var requestData = new
+ List<Dt_CabinOrder> dt_CabinOrders = new List<Dt_CabinOrder>();
+ #region 鐗规畩鑽搧鍏ョ壒娈婂簱鎴�
+ if (order.warehouse_no == WarehouseEnum.楹荤簿搴�.ObjToInt().ToString("000") || order.warehouse_no == WarehouseEnum.鍐峰喕搴�.ObjToInt().ToString("000"))
{
- //searchDate = SearchDate
- searchDate = "2020-10-10 20:45:16" // 姝ｇ‘鐨勬牸寮�
- };
- //SearchDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");
-
- var result = HttpHelper.Post(url, requestData.ToJsonString());
- var response = JsonConvert.DeserializeObject<UpstreamResponse<UpstreamOrderInfo>>(result);
-
- if (response.resultCode != "0")
- {
- SendErrorToUpstream(1, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
- return responseContent.Error(response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触");
- }
-
- if (response.data == null || !response.data.Any())
- return responseContent.OK("鏃犳柊鍏ュ簱鍗曟暟鎹�");
-
- var existingOrderNos = BaseDal.Db.Queryable<Dt_CabinOrder>()
- .Select(x => x.Order_no)
- .ToList();
-
- var newOrders = response.data
- .Where(order => !existingOrderNos.Contains(order.order_no))
- .ToList();
-
- if (!newOrders.Any())
- return responseContent.OK("鎵�鏈夊叆搴撳崟宸插瓨鍦紝鏃犻渶鏂板");
-
- Db.Ado.BeginTran();
- try
- {
- List<Dt_CabinOrder> _CabinOrders = new();
- List<string> orderNos = new();
-
- foreach (var order in newOrders)
+ var entityOrder = new Dt_CabinOrder
{
- bool skipOrder = false; // 鏍囪鏄惁璺宠繃璇ュ叆搴撳崟
- var entityOrder = new Dt_CabinOrder
+ Order_no = order.order_no,
+ Order_type = order.order_type,
+ Supplier_no = order.supplier_no,
+ Account_tiem = order.account_time,
+ OdrderStatus = "鏂板缓",
+ Supplier_name = order.supplier_name,
+ Warehouse_no = order.warehouse_no,
+ Details = order.details.Select(d => new Dt_CabinOrderDetail
{
- Order_no = order.order_no,
- Order_type = order.order_type,
- Supplier_no = order.supplier_no,
- Account_tiem = order.account_time,
- OdrderStatus = "鏂板缓",
- Supplier_name = order.supplier_name,
- Warehouse_no = order.warehouse_no,
- Details = new List<Dt_CabinOrderDetail>()
- };
-
- foreach (var item in order.details)
+ Goods_no = d.goods_no,
+ Order_qty = Math.Abs(d.order_qty),
+ Batch_num = d.batch_num,
+ Exp_date = d.exp_date,
+ OrderDetailStatus = "鏂板缓",
+ Status = 2, //濡傛灉鏄�001鎴块偅涔堝氨鏄湭鍚屾鐘舵�侊紝濡傛灉涓嶆槸001鎴块偅涔堝氨鏄棤闇�鍚屾鐘舵��
+ }).ToList()
+ };
+ dt_CabinOrders.Add(entityOrder);
+ webResponseContent.OK(data: dt_CabinOrders);
+ }
+ #endregion
+ else
+ {
+ var entityOrder = new Dt_CabinOrder//澶т欢搴撹鍗�
+ {
+ Order_no = order.order_no,
+ Order_type = order.order_type,
+ Supplier_no = order.supplier_no,
+ Account_tiem = order.account_time,
+ OdrderStatus = "鏂板缓",
+ Supplier_name = order.supplier_name,
+ Warehouse_no = WarehouseEnum.澶т欢搴�.ObjToInt().ToString("000"),
+ Details = new List<Dt_CabinOrderDetail>()
+ };
+ var entityOrderLK = new Dt_CabinOrder//绔嬪簱璁㈠崟
+ {
+ Order_no = order.order_no,
+ Order_type = order.order_type,
+ Supplier_no = order.supplier_no,
+ Account_tiem = order.account_time,
+ OdrderStatus = "鏂板缓",
+ Supplier_name = order.supplier_name,
+ Warehouse_no = WarehouseEnum.绔嬪簱.ObjToInt().ToString("000"),
+ Details = new List<Dt_CabinOrderDetail>()
+ };
+ foreach (var item in order.details)
+ {
+ // 灏嗕笂娓稿叆搴撴暟閲忚浆涓烘鏁�
+ item.order_qty = Math.Abs(item.order_qty);
+ #region 鏍规嵁鐗╂枡缂栫爜鏌ヨ鐗╂枡淇℃伅
+ Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == item.goods_no);
+ if (materielInfo == null) throw new Exception($"鏈壘鍒拌嵂鍝佺紪鐮併�恵item.goods_no}銆戠殑淇℃伅");
+ if (!Enum.IsDefined(typeof(MaterielSourceTypeEnum), materielInfo.MaterielSourceType))
+ throw new Exception($"璇疯缃嵂鍝佺紪鍙枫�恵item.goods_no}銆戠殑灞炴�у垎绫�");
+ if (materielInfo.BoxQty < 1) throw new Exception($"璇疯缃嵂鍝佺紪鍙枫�恵item.goods_no}銆戠殑绠辫鏁伴噺");
+ if (materielInfo.MinQty < 1) throw new Exception($"璇疯缃嵂鍝佺紪鍙枫�恵item.goods_no}銆戠殑绔嬪簱鏈�浣庡簱瀛樻暟");
+ #endregion
+ #region 澶т欢
+ if (materielInfo.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart)//濡傛灉鐗╂枡鏄ぇ浠�
{
- item.order_qty = Math.Abs(item.order_qty);
-
- // 鏌ヨ鐗╂枡淇℃伅
- var materielInfo = BaseDal.Db.Queryable<Dt_MedicineGoods>()
- .Where(x => x.Goods_no == item.goods_no)
- .First();
-
-
- //濡傛灉鐗╂枡淇℃伅涓嶅瓨鍦紝璺宠繃鏁翠釜鍏ュ簱鍗�
- if (materielInfo == null)
+ Dt_CabinOrderDetail orderDetail = new Dt_CabinOrderDetail()
{
- skipOrder = true;
- Console.WriteLine($"璺宠繃鍏ュ簱鍗� {order.order_no}锛屽師鍥狅細鏈壘鍒板晢鍝� [{item.goods_no}] 鐨勭墿鏂欎俊鎭��");
- break;
- }
-
- // 鑻ョ墿鏂欎笉瀛樺湪鎴� MaterielSourceType 涓虹┖锛屽垯璺宠繃鏁翠釜鍏ュ簱鍗�
- if (materielInfo == null || !Enum.IsDefined(typeof(MaterielSourceTypeEnum), materielInfo.MaterielSourceType))
+ Reservoirarea = entityOrder.Warehouse_no,
+ Goods_no = item.goods_no,
+ Order_qty = item.order_qty,
+ Batch_num = item.batch_num,
+ Exp_date = item.exp_date,
+ OrderDetailStatus = "鏂板缓",
+ Status = 2
+ };
+ entityOrder.Details.Add(orderDetail);
+ }
+ #endregion
+ else
+ {
+ Dt_CabinOrderDetail orderDetail = null;
+ var ys = item.order_qty % materielInfo.BoxQty; //涓嶈兘鏁撮櫎绠辫鐨勬暎浠舵暟
+ var xs = (int)(item.order_qty / materielInfo.BoxQty);//淇濈暀鏁存暟
+ #region 鍒ゆ柇鏄惁鏈夋暎浠�
+ if (ys > 0)
{
- skipOrder = true;
- break;
- }
-
- // 鍖哄垎澶т欢/灏忎欢
- if (materielInfo.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart)
- {
- var detail = new Dt_CabinOrderDetail
+ orderDetail = new Dt_CabinOrderDetail()
{
- Reservoirarea = order.warehouse_no,
+ Reservoirarea = entityOrderLK.Warehouse_no,
Goods_no = item.goods_no,
- Order_qty = item.order_qty,
+ Order_qty = ys,
Batch_num = item.batch_num,
Exp_date = item.exp_date,
OrderDetailStatus = "鏂板缓",
- Status = 2
+ Status = 0
};
- entityOrder.Details.Add(detail);
+ materielInfo.Business_qty += ys;
}
- else
- {
- Dt_CabinOrderDetail orderDetail = null;
- var ys = item.order_qty % materielInfo.BoxQty; // 涓嶈兘鏁撮櫎鐨勬暎浠�
- var xs = item.order_qty / materielInfo.BoxQty; // 鏁寸鏁伴噺
+ #endregion
- // 鏈夋暎浠�
- if (ys > 0)
+ #region 鍒ゆ柇绔嬪簱搴撳瓨鏄惁澶т簬绔嬪簱鏈�浣庡簱瀛樻暟
+ while (materielInfo.Business_qty < materielInfo.MinQty && xs > 0) //褰撲笟鍔℃暟閲忓拰鏁寸鏁伴兘澶т簬0鐨勬椂鍊欐墠浼氬仠姝㈠惊鐜�
+ {
+ xs--;
+ if (orderDetail == null)
{
- orderDetail = new Dt_CabinOrderDetail
+ orderDetail = new Dt_CabinOrderDetail()
{
- Reservoirarea = order.warehouse_no,
+ Reservoirarea = entityOrderLK.Warehouse_no,
Goods_no = item.goods_no,
- Order_qty = ys,
+ Order_qty = materielInfo.BoxQty,
Batch_num = item.batch_num,
Exp_date = item.exp_date,
OrderDetailStatus = "鏂板缓",
Status = 0
};
- materielInfo.Business_qty += ys;
- }
-
- // 涓嶈冻鏈�浣庡簱瀛樻椂琛ュ叆绔嬪簱
- while (materielInfo.Business_qty < materielInfo.MinQty && xs > 0)
- {
- xs--;
- if (orderDetail == null)
- {
- orderDetail = new Dt_CabinOrderDetail
- {
- Reservoirarea = order.warehouse_no,
- Goods_no = item.goods_no,
- Order_qty = materielInfo.BoxQty,
- Batch_num = item.batch_num,
- Exp_date = item.exp_date,
- OrderDetailStatus = "鏂板缓",
- Status = 0
- };
- }
- else
- {
- orderDetail.Order_qty += materielInfo.BoxQty;
- }
materielInfo.Business_qty += materielInfo.BoxQty;
}
-
- if (orderDetail != null) entityOrder.Details.Add(orderDetail);
-
- // 鍓╀綑鏁寸鍏ュ钩搴�
- if (xs > 0)
+ else
{
- entityOrder.Details.Add(new Dt_CabinOrderDetail
- {
- Reservoirarea = order.warehouse_no,
- Goods_no = item.goods_no,
- Order_qty = materielInfo.BoxQty * xs,
- Batch_num = item.batch_num,
- Exp_date = item.exp_date,
- OrderDetailStatus = "鏂板缓",
- Status = 2
- });
+ orderDetail.Order_qty += materielInfo.BoxQty;
+ materielInfo.Business_qty += materielInfo.BoxQty;
}
}
- _medicineGoodsServices.Db.Updateable(materielInfo).ExecuteCommand();
+ if (orderDetail != null) entityOrderLK.Details.Add(orderDetail);
+ #endregion
+
+ #region 鍓╀綑鏁翠欢鍏ュ钩搴�
+ if (xs > 0)
+ {
+ orderDetail = new Dt_CabinOrderDetail()
+ {
+ Reservoirarea = entityOrder.Warehouse_no,
+ Goods_no = item.goods_no,
+ Order_qty = materielInfo.BoxQty * xs,
+ Batch_num = item.batch_num,
+ Exp_date = item.exp_date,
+ OrderDetailStatus = "鏂板缓",
+ Status = 2
+ };
+ entityOrder.Details.Add(orderDetail);
+ }
+ #endregion
}
-
- // 鉂楀鏋滆烦杩囪鍗曪紝鍒欑洿鎺ontinue锛屼笉淇濆瓨
- if (skipOrder)
- {
- Console.WriteLine($"璺宠繃鍏ュ簱鍗� {order.order_no}锛屽洜涓哄瓨鍦ㄦ湭瀹氫箟鐗╂枡灞炴�х殑鍟嗗搧銆�");
- continue;
- }
-
- _CabinOrders.Add(entityOrder);
- orderNos.Add(order.order_no);
+ _basicService.MaterielInfoService.Repository.UpdateData(materielInfo);
}
-
- if (_CabinOrders.Any())
- {
- BaseDal.Db.InsertNav(_CabinOrders).Include(x => x.Details).ExecuteCommand();
- Db.Ado.CommitTran();
- return responseContent.OK($"鎴愬姛鍚屾 {_CabinOrders.Count} 鏉″叆搴撳崟");
- }
- else
- {
- Db.Ado.RollbackTran();
- return responseContent.OK("鏃犲彲澶勭悊鐨勫叆搴撳崟锛堝晢鍝佸睘鎬ф湭瀹氫箟鎴栨湭鎵惧埌锛�");
- }
- }
- catch (Exception ex)
- {
- Db.Ado.RollbackTran();
- SendErrorToUpstream(1, "", ex.Message, "");
- return responseContent.Error("鍚屾澶辫触: " + ex.Message);
+ if (entityOrder.Details.Count > 0) dt_CabinOrders.Add(entityOrder);
+ if (entityOrderLK.Details.Count > 0) dt_CabinOrders.Add(entityOrderLK);
+ webResponseContent.OK(data: dt_CabinOrders);
}
}
catch (Exception ex)
{
- SendErrorToUpstream(1, "", ex.Message, "");
- return responseContent.Error("鍚屾澶辫触: " + ex.Message);
+ webResponseContent.Error(ex.Message);
}
+ return webResponseContent;
}
+ #endregion
/// <summary>
/// 浼犵粰wcs
@@ -782,7 +596,7 @@
order.Details = order.Details.Where(d => d.Status == 0).ToList();
Console.WriteLine($"璁㈠崟 {order.Order_no} 杩囨护鍚庢槑缁嗘暟锛歿order.Details.Count}");
}
-
+
if (orders == null || !orders.Any())
{
@@ -883,113 +697,42 @@
var responseContent = new WebResponseContent();
try
{
- // 鏌ユ壘鎵�鏈夆�滃紑濮嬧�濈姸鎬佺殑鍏ュ簱鍗�
- var orders = BaseDal.Db.Queryable<Dt_CabinOrder>()
- .Where(o => o.OdrderStatus == "寮�濮�")
- .ToList();
-
- if (orders == null || !orders.Any())
+ #region 鏌ユ壘鎵�鏈夊凡瀹屾垚鍏ュ簱鍗�
+ var inorders = BaseDal.QueryData(x => x.OdrderStatus == "宸插畬鎴�").Select(x => x.Order_no).ToList();
+ foreach (var inorder in inorders)
{
- return responseContent.OK("鏆傛棤闇�瑕佸鐞嗙殑鍏ュ簱鍗�");
- }
-
- int successCount = 0;
- int failCount = 0;
-
- foreach (var order in orders)
- {
- try
+ //var Orders = BaseDal.QueryData(x => x.Order_no == inorder);
+ var Orders = BaseDal.Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == inorder).Includes(x => x.Details).ToList();
+ if (!Orders.Where(x => x.OdrderStatus != "宸插畬鎴�").Any())
{
BaseDal.Db.Ado.BeginTran();
-
- // 鏌ヨ璇ュ崟鐨勬槑缁�
- var details = BaseDal.Db.Queryable<Dt_CabinOrderDetail>()
- .Where(d => d.OrderId == order.Id)
- .ToList();
-
- // 鍒ゆ柇鏄惁鍏ㄩ儴瀹屾垚
- var totalCount = details.Count;
- var completedCount = details.Count(d => d.OrderDetailStatus == "宸插畬鎴�");
-
- if (totalCount > 0 && completedCount == totalCount)
+ BaseDal.DeleteAndMoveIntoHty(Orders, OperateTypeEnum.鑷姩瀹屾垚);
+ foreach (var item in Orders)
{
- // 鏇存柊琛ㄥご鐘舵��
- order.OdrderStatus = "宸插畬鎴�";
- BaseDal.Db.Updateable(order).ExecuteCommand();
-
- // 璋冪敤涓婃父鎺ュ彛
- var url = "http://121.37.118.63:80/GYZ2/95fck/inOrderOk";
- var result = HttpHelper.Post(url, new { order_no = order.Order_no }.ToJsonString());
- var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
-
- if (response.resultCode == "0")
- {
- // === 姝ラ 1锛氭彃鍏ュ巻鍙茶〃 ===
-
- // 1.1 鎻掑叆琛ㄥご鍘嗗彶
- var orderHistory = new Dt_CabinOrder_Hty
- {
- Id = order.Id,
- Order_no = order.Order_no,
- Order_type = order.Order_type,
- Supplier_no = order.Supplier_no,
- Supplier_name = order.Supplier_name,
- Account_tiem = order.Account_tiem,
- Warehouse_no = order.Warehouse_no,
- OdrderStatus = order.OdrderStatus,
-
- };
- var historyId = BaseDal.Db.Insertable(orderHistory).ExecuteReturnIdentity();
-
- // 1.2 鎻掑叆鏄庣粏鍘嗗彶
- var detailsHistory = details.Select(d => new Dt_CabinOrderDetail_Hty
- {
- Id = d.Id,
- Reservoirarea = d.Reservoirarea,
- Goods_no = d.Goods_no,
- Order_qty = d.Order_qty,
- Order_Inqty = d.Order_Inqty,
- Batch_num = d.Batch_num,
- Exp_date = d.Exp_date,
- OrderDetailStatus = d.OrderDetailStatus,
- Status = d.Status,
-
- }).ToList();
-
- BaseDal.Db.Insertable(detailsHistory).ExecuteCommand();
-
- // === 姝ラ 2锛氬垹闄ゅ師濮嬭〃 ===
- BaseDal.Db.Deleteable<Dt_CabinOrderDetail>().Where(d => d.OrderId == order.Id).ExecuteCommand();
- BaseDal.Db.Deleteable<Dt_CabinOrder>().Where(o => o.Id == order.Id).ExecuteCommand();
-
- // 鎻愪氦浜嬪姟
- BaseDal.Db.Ado.CommitTran();
- successCount++;
- }
- else
- {
- BaseDal.Db.Ado.RollbackTran();
- failCount++;
- SendErrorToUpstream(2, "", $"涓婃父鎺ュ彛杩斿洖澶辫触: {response.resultMsg}", order.Order_no);
- }
+ _cabinOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.鑷姩瀹屾垚);
+ }
+ // 璋冪敤涓婃父鎺ュ彛
+ var url = "http://121.37.118.63:80/GYZ2/95fck/inOrderOk";
+ var result = HttpHelper.Post(url, new { order_no = inorder }.ToJsonString());
+ var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
+ if (response.resultCode == "0")
+ {
+ // 鎻愪氦浜嬪姟
+ BaseDal.Db.Ado.CommitTran();
}
else
{
BaseDal.Db.Ado.RollbackTran();
+ SendErrorToUpstream(2, "", $"涓婃父鎺ュ彛杩斿洖澶辫触: {response.resultMsg}", inorder);
}
}
- catch (Exception ex)
- {
- BaseDal.Db.Ado.RollbackTran();
- failCount++;
- SendErrorToUpstream(1, "", ex.Message, order.Order_no);
- }
}
-
- return responseContent.OK($"鎵归噺澶勭悊瀹屾垚锛氭垚鍔� {successCount} 鍗曪紝澶辫触 {failCount} 鍗曘��");
+ #endregion
+ return responseContent.OK();
}
catch (Exception ex)
{
+ BaseDal.Db.Ado.RollbackTran();
return responseContent.Error("鎵归噺澶勭悊澶辫触锛�" + ex.Message);
}
}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
index 92c8eb7..04a2ab7 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
@@ -662,8 +662,8 @@
if (mainOrder == null) continue;
var location = Db.Queryable<Dt_InventoryInfo>()
- .Where(x => x.MaterielCode == materielCode
- && x.BatchNo == batchNo
+ .Where(x => x.MaterielCode == ""//materielCode
+ && x.BatchNo == ""//batchNo
&& x.StockQuantity > 0)
.OrderBy(x => x.InDate) // 鎸夊叆搴撴椂闂存帓搴�
.First();
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrder.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrder.vue"
index 02f9667..4e08ca1 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrder.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrder.vue"
@@ -199,7 +199,7 @@
type: "string",
width: 100,
align: "left",
- bind: { key: "warehouse", data: [] },
+ bind: { key: "warehouseNuber", data: [] },
},
{
field: "account_tiem",
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrderDetail_Hty.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrderDetail_Hty.vue"
index bd0ccd1..2843c92 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrderDetail_Hty.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrderDetail_Hty.vue"
@@ -181,7 +181,7 @@
table: "DtCabinOrderDetailHtyDetail",
columns: [
{
- field: 'historyId',
+ field: 'id',
title: '鍘嗗彶璁板綍涓婚敭',
type: 'int',
width: 120,
@@ -191,7 +191,7 @@
align: 'left'
},
{
- field: 'id',
+ field: 'sourceId',
title: '鍘熶富閿�',
type: 'int',
width: 100,
@@ -288,8 +288,8 @@
sort: true
}
],
- sortName: "historyId",
- key: "historyId"
+ sortName: "orderId",
+ key: "orderId"
});
return {
table,
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\345\214\273\350\215\257\351\241\271\347\233\256\347\263\273\347\273\237WMS \357\274\210\344\270\212\346\270\270\051.xlsx" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\345\214\273\350\215\257\351\241\271\347\233\256\347\263\273\347\273\237WMS \357\274\210\344\270\212\346\270\270\051.xlsx"
new file mode 100644
index 0000000..73d9e75
--- /dev/null
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\345\214\273\350\215\257\351\241\271\347\233\256\347\263\273\347\273\237WMS \357\274\210\344\270\212\346\270\270\051.xlsx"
Binary files differ
--
Gitblit v1.9.3