From f987238f1288c098089a826bb4e77c7874a0a9c4 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 24 十二月 2025 14:38:56 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_BasicService/MESOperation/FeedbackMesService.cs | 31 ++-
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Allocate/AllocateOrderController.cs | 2
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Jobs/InventoryLockJob.cs | 14
项目代码/WIDESEA_WMSClient/src/views/Login.vue | 4
项目代码/WIDESEA_WMSClient/src/extension/outbound/outboundOrder.js | 3
项目代码/WIDESEA_WMSClient/src/extension/inbound/extend/allocateOrderDetail.vue | 276 +++++++++++++-------------
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundService.cs | 2
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_BasicService/ESSApiService.cs | 52 +++-
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_InboundService/InboundService.cs | 1
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Jobs/QuartzJobMildd.cs | 28 +-
项目代码/WIDESEA_WMSClient/src/extension/outbound/extend/newAllocateOrderDetail.vue | 154 ++++++++++++++-
11 files changed, 364 insertions(+), 203 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/allocateOrderDetail.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/allocateOrderDetail.vue"
index 1bdbfaf..e170fa5 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/allocateOrderDetail.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/allocateOrderDetail.vue"
@@ -315,149 +315,149 @@
});
},
outbound() {
- if (this.selection.length === 0) {
- return this.$message.error("璇烽�夋嫨鍗曟嵁鏄庣粏");
- }
- const platformOptions = [
- { label: "绔欏彴2", value: "2-1" },
- { label: "绔欏彴3", value: "3-1" },
- ];
- const mountNode = document.createElement("div");
- document.body.appendChild(mountNode);
+ // if (this.selection.length === 0) {
+ // return this.$message.error("璇烽�夋嫨鍗曟嵁鏄庣粏");
+ // }
+ // const platformOptions = [
+ // { label: "绔欏彴2", value: "2-1" },
+ // { label: "绔欏彴3", value: "3-1" },
+ // ];
+ // const mountNode = document.createElement("div");
+ // document.body.appendChild(mountNode);
- const formData = reactive({
- selectedPlatform: platformOptions[0].value,
- });
+ // const formData = reactive({
+ // selectedPlatform: platformOptions[0].value,
+ // });
- const vnode = createVNode(
- ElDialog,
- {
- title: "鍑哄簱鎿嶄綔 - 閫夋嫨鍑哄簱绔欏彴",
- width: "500px",
- modelValue: true,
- appendToBody: true,
- "onUpdate:modelValue": (isVisible) => {
- if (!isVisible) {
- render(null, mountNode);
- document.body.removeChild(mountNode);
- }
- },
- style: {
- padding: "20px 0",
- borderRadius: "8px",
- },
- },
- {
- default: () =>
- h(
- ElForm,
- {
- model: formData,
- rules: {
- selectedPlatform: [
- { required: true, message: "璇烽�夋嫨鍑哄簱绔欏彴", trigger: "change" },
- ],
- },
- ref: "outboundForm",
- labelWidth: "100px",
- style: {
- padding: "0 30px",
- },
- },
- [
- h(ElFormItem, {
- label: "鍑哄簱绔欏彴",
- prop: "selectedPlatform",
- style: {
- marginBottom: "24px",
- },
- }, [
- h(ElSelect, {
- placeholder: "璇烽�夋嫨鍑哄簱绔欏彴锛�3-12锛�",
- modelValue: formData.selectedPlatform,
- "onUpdate:modelValue": (val) => {
- formData.selectedPlatform = val;
- },
- style: {
- width: "100%",
- height: "40px",
- borderRadius: "4px",
- borderColor: "#dcdfe6",
- },
- }, platformOptions.map((platform) =>
- h(ElOption, { label: platform.label, value: platform.value })
- )),
- ]),
- h("div", {
- style: {
- textAlign: "right",
- marginTop: "8px",
- paddingRight: "4px",
- },
- }, [
- h(ElButton, {
- type: "text",
- onClick: () => {
- render(null, mountNode);
- document.body.removeChild(mountNode);
- ElMessage.info("鍙栨秷鍑哄簱鎿嶄綔");
- },
- style: {
- marginRight: "8px",
- color: "#606266",
- },
- }, "鍙栨秷"),
- h(ElButton, {
- type: "primary",
- onClick: async () => {
- const formRef = vnode.component.refs.outboundForm;
- try {
- await formRef.validate();
- } catch (err) {
- return;
- }
+ // const vnode = createVNode(
+ // ElDialog,
+ // {
+ // title: "鍑哄簱鎿嶄綔 - 閫夋嫨鍑哄簱绔欏彴",
+ // width: "500px",
+ // modelValue: true,
+ // appendToBody: true,
+ // "onUpdate:modelValue": (isVisible) => {
+ // if (!isVisible) {
+ // render(null, mountNode);
+ // document.body.removeChild(mountNode);
+ // }
+ // },
+ // style: {
+ // padding: "20px 0",
+ // borderRadius: "8px",
+ // },
+ // },
+ // {
+ // default: () =>
+ // h(
+ // ElForm,
+ // {
+ // model: formData,
+ // rules: {
+ // selectedPlatform: [
+ // { required: true, message: "璇烽�夋嫨鍑哄簱绔欏彴", trigger: "change" },
+ // ],
+ // },
+ // ref: "outboundForm",
+ // labelWidth: "100px",
+ // style: {
+ // padding: "0 30px",
+ // },
+ // },
+ // [
+ // h(ElFormItem, {
+ // label: "鍑哄簱绔欏彴",
+ // prop: "selectedPlatform",
+ // style: {
+ // marginBottom: "24px",
+ // },
+ // }, [
+ // h(ElSelect, {
+ // placeholder: "璇烽�夋嫨鍑哄簱绔欏彴锛�3-12锛�",
+ // modelValue: formData.selectedPlatform,
+ // "onUpdate:modelValue": (val) => {
+ // formData.selectedPlatform = val;
+ // },
+ // style: {
+ // width: "100%",
+ // height: "40px",
+ // borderRadius: "4px",
+ // borderColor: "#dcdfe6",
+ // },
+ // }, platformOptions.map((platform) =>
+ // h(ElOption, { label: platform.label, value: platform.value })
+ // )),
+ // ]),
+ // h("div", {
+ // style: {
+ // textAlign: "right",
+ // marginTop: "8px",
+ // paddingRight: "4px",
+ // },
+ // }, [
+ // h(ElButton, {
+ // type: "text",
+ // onClick: () => {
+ // render(null, mountNode);
+ // document.body.removeChild(mountNode);
+ // ElMessage.info("鍙栨秷鍑哄簱鎿嶄綔");
+ // },
+ // style: {
+ // marginRight: "8px",
+ // color: "#606266",
+ // },
+ // }, "鍙栨秷"),
+ // h(ElButton, {
+ // type: "primary",
+ // onClick: async () => {
+ // const formRef = vnode.component.refs.outboundForm;
+ // try {
+ // await formRef.validate();
+ // } catch (err) {
+ // return;
+ // }
- const keys = this.selection.map((item) => item.id);
- const requestParams = {
- detailIds: keys,
- outboundTargetLocation: formData.selectedPlatform,
- outboundQuantity: 1,
- operator: "",
- orderNo: this.row.orderNo,
- };
+ // const keys = this.selection.map((item) => item.id);
+ // const requestParams = {
+ // detailIds: keys,
+ // outboundTargetLocation: formData.selectedPlatform,
+ // outboundQuantity: 1,
+ // operator: "",
+ // orderNo: this.row.orderNo,
+ // };
- this.http
- .post(
- "api/Outbound/ProcessPickingOutbound",
- requestParams,
- "鏁版嵁澶勭悊涓�"
- )
- .then((x) => {
- if (!x.status) return ElMessage.error(x.message);
- ElMessage.success("鎿嶄綔鎴愬姛");
- this.showDetialBox = false;
- this.$emit("parentCall", ($vue) => {
- $vue.getData();
- });
- render(null, mountNode);
- document.body.removeChild(mountNode);
- })
- // .catch(() => {
- // ElMessage.error("璇锋眰澶辫触锛岃绋嶅悗閲嶈瘯");
- // });
- },
- style: {
- borderRadius: "4px",
- padding: "8px 20px",
- },
- }, "纭畾鍑哄簱"),
- ]),
- ]),
- }
- );
+ // this.http
+ // .post(
+ // "api/Outbound/ProcessPickingOutbound",
+ // requestParams,
+ // "鏁版嵁澶勭悊涓�"
+ // )
+ // .then((x) => {
+ // if (!x.status) return ElMessage.error(x.message);
+ // ElMessage.success("鎿嶄綔鎴愬姛");
+ // this.showDetialBox = false;
+ // this.$emit("parentCall", ($vue) => {
+ // $vue.getData();
+ // });
+ // render(null, mountNode);
+ // document.body.removeChild(mountNode);
+ // })
+ // // .catch(() => {
+ // // ElMessage.error("璇锋眰澶辫触锛岃绋嶅悗閲嶈瘯");
+ // // });
+ // },
+ // style: {
+ // borderRadius: "4px",
+ // padding: "8px 20px",
+ // },
+ // }, "纭畾鍑哄簱"),
+ // ]),
+ // ]),
+ // }
+ // );
- vnode.appContext = this.$.appContext;
- render(vnode, mountNode);
+ // vnode.appContext = this.$.appContext;
+ // render(vnode, mountNode);
},
outboundbatch() {
if (this.selection.length === 0) {
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/newAllocateOrderDetail.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/newAllocateOrderDetail.vue"
index 822b35f..a4f1a20 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/newAllocateOrderDetail.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/newAllocateOrderDetail.vue"
@@ -315,19 +315,149 @@
});
},
outbound() {
- if (this.selection.length === 0) {
- return this.$message.error("璇烽�夋嫨鍗曟嵁鏄庣粏");
- }
+ // if (this.selection.length === 0) {
+ // return this.$message.error("璇烽�夋嫨鍗曟嵁鏄庣粏");
+ // }
+ // const platformOptions = [
+ // { label: "绔欏彴2", value: "2-1" },
+ // { label: "绔欏彴3", value: "3-1" },
+ // ];
+ // const mountNode = document.createElement("div");
+ // document.body.appendChild(mountNode);
- const keys = this.selection.map((item) => item.id);
- const requestParams = {
- detailIds: keys,
- outboundQuantity: 1,
- operator: "",
- orderNo: this.row.orderNo,
- isBatch: this.isBatch
- };
- this.$refs.DirectOutbound.open(requestParams);
+ // const formData = reactive({
+ // selectedPlatform: platformOptions[0].value,
+ // });
+
+ // const vnode = createVNode(
+ // ElDialog,
+ // {
+ // title: "鍑哄簱鎿嶄綔 - 閫夋嫨鍑哄簱绔欏彴",
+ // width: "500px",
+ // modelValue: true,
+ // appendToBody: true,
+ // "onUpdate:modelValue": (isVisible) => {
+ // if (!isVisible) {
+ // render(null, mountNode);
+ // document.body.removeChild(mountNode);
+ // }
+ // },
+ // style: {
+ // padding: "20px 0",
+ // borderRadius: "8px",
+ // },
+ // },
+ // {
+ // default: () =>
+ // h(
+ // ElForm,
+ // {
+ // model: formData,
+ // rules: {
+ // selectedPlatform: [
+ // { required: true, message: "璇烽�夋嫨鍑哄簱绔欏彴", trigger: "change" },
+ // ],
+ // },
+ // ref: "outboundForm",
+ // labelWidth: "100px",
+ // style: {
+ // padding: "0 30px",
+ // },
+ // },
+ // [
+ // h(ElFormItem, {
+ // label: "鍑哄簱绔欏彴",
+ // prop: "selectedPlatform",
+ // style: {
+ // marginBottom: "24px",
+ // },
+ // }, [
+ // h(ElSelect, {
+ // placeholder: "璇烽�夋嫨鍑哄簱绔欏彴锛�3-12锛�",
+ // modelValue: formData.selectedPlatform,
+ // "onUpdate:modelValue": (val) => {
+ // formData.selectedPlatform = val;
+ // },
+ // style: {
+ // width: "100%",
+ // height: "40px",
+ // borderRadius: "4px",
+ // borderColor: "#dcdfe6",
+ // },
+ // }, platformOptions.map((platform) =>
+ // h(ElOption, { label: platform.label, value: platform.value })
+ // )),
+ // ]),
+ // h("div", {
+ // style: {
+ // textAlign: "right",
+ // marginTop: "8px",
+ // paddingRight: "4px",
+ // },
+ // }, [
+ // h(ElButton, {
+ // type: "text",
+ // onClick: () => {
+ // render(null, mountNode);
+ // document.body.removeChild(mountNode);
+ // ElMessage.info("鍙栨秷鍑哄簱鎿嶄綔");
+ // },
+ // style: {
+ // marginRight: "8px",
+ // color: "#606266",
+ // },
+ // }, "鍙栨秷"),
+ // h(ElButton, {
+ // type: "primary",
+ // onClick: async () => {
+ // const formRef = vnode.component.refs.outboundForm;
+ // try {
+ // await formRef.validate();
+ // } catch (err) {
+ // return;
+ // }
+
+ // const keys = this.selection.map((item) => item.id);
+ // const requestParams = {
+ // detailIds: keys,
+ // outboundTargetLocation: formData.selectedPlatform,
+ // outboundQuantity: 1,
+ // operator: "",
+ // orderNo: this.row.orderNo,
+ // };
+
+ // this.http
+ // .post(
+ // "api/Outbound/ProcessPickingOutbound",
+ // requestParams,
+ // "鏁版嵁澶勭悊涓�"
+ // )
+ // .then((x) => {
+ // if (!x.status) return ElMessage.error(x.message);
+ // ElMessage.success("鎿嶄綔鎴愬姛");
+ // this.showDetialBox = false;
+ // this.$emit("parentCall", ($vue) => {
+ // $vue.getData();
+ // });
+ // render(null, mountNode);
+ // document.body.removeChild(mountNode);
+ // })
+ // // .catch(() => {
+ // // ElMessage.error("璇锋眰澶辫触锛岃绋嶅悗閲嶈瘯");
+ // // });
+ // },
+ // style: {
+ // borderRadius: "4px",
+ // padding: "8px 20px",
+ // },
+ // }, "纭畾鍑哄簱"),
+ // ]),
+ // ]),
+ // }
+ // );
+
+ // vnode.appContext = this.$.appContext;
+ // render(vnode, mountNode);
},
outboundbatch() {
if (this.selection.length === 0) {
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/outboundOrder.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/outboundOrder.js"
index be51ac6..6fa1f60 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/outboundOrder.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/outboundOrder.js"
@@ -385,10 +385,13 @@
if (rows.length == 0) return this.$error("璇烽�夋嫨鏁版嵁!");
if (rows.length > 1) return this.$error("璇烽�夋嫨涓�鏉℃暟鎹�!");
+
// 纭繚閫変腑琛屾湁id锛堟牴鎹疄闄呰〃鏍兼暟鎹瓧娈佃皟鏁达紝姣斿rows[0].detailId绛夛級
const selectedId = rows[0].id || rows[0].detailId;
if (!selectedId) return this.$error("閫変腑鏁版嵁缂哄皯蹇呰ID瀛楁!");
+ if(rows[0].orderStatus!=0&&rows[0].orderStatus!=1)return this.$error("璇ュ崟鎹凡缁忓畬鎴�");
+
const platformOptions = [
{ label: "绔欏彴2", value: "2-1" },
{ label: "绔欏彴3", value: "3-1" },
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/Login.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/Login.vue"
index 99d69b8..91b5e8d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/Login.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/Login.vue"
@@ -68,8 +68,8 @@
const codeImgSrc = ref("");
const value = ref("");
const userInfo = reactive({
- userName: "admin",
- password: "123456",
+ userName: "",
+ password: "",
verificationCode: "1234",
UUID: undefined,
});
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/ESSApiService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/ESSApiService.cs"
index 659a98c..0ee3520 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/ESSApiService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/ESSApiService.cs"
@@ -8,6 +8,8 @@
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
+using WIDESEA_Core.Helper;
+using WIDESEA_Core.LogHelper;
using WIDESEA_DTO.Basic;
using WIDESEA_IBasicService;
@@ -66,6 +68,8 @@
var result = await PostAsync<TaskModel, ApiResponse<TasksData>>(url, request);
if (result != null && result.Code == 0)
{
+ _logger.LogInformation(result.Serialize());
+
return true;
}
return false;
@@ -76,31 +80,45 @@
return false;
}
}
-
+
private async Task<TResponse> PostAsync<TRequest, TResponse>(string url, TRequest request)
{
-
- string json = JsonConvert.SerializeObject(request, new JsonSerializerSettings
+ TResponse response1 = (TResponse)Activator.CreateInstance(typeof(TResponse));
+ try
{
- ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver()
- });
- var content = new StringContent(json, Encoding.UTF8, "application/json");
- var _client = _httpClientFactory.CreateClient("ESSUrl");
- _client.DefaultRequestHeaders.Clear();
+ string json = JsonConvert.SerializeObject(request, new JsonSerializerSettings
+ {
+ ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver()
+ });
+ var content = new StringContent(json, Encoding.UTF8, "application/json");
+ var _client = _httpClientFactory.CreateClient("ESSUrl");
+ _client.DefaultRequestHeaders.Clear();
- _client.DefaultRequestHeaders.Add("Accept", "application/json");
+ _client.DefaultRequestHeaders.Add("Accept", "application/json");
- using var response = await _client.PostAsync(url, content);
- string body = await response.Content.ReadAsStringAsync();
- _logger.LogInformation($"ESSAPI post : {_client.BaseAddress} {url} {body}");
- if (!response.IsSuccessStatusCode)
- {
- throw new HttpRequestException(body);
+ using var response = await _client.PostAsync(url, content);
+ string body = await response.Content.ReadAsStringAsync();
+ _logger.LogInformation($"ESSAPI post : {_client.BaseAddress} {url} {body}");
+ if (!response.IsSuccessStatusCode)
+ {
+ throw new HttpRequestException(body);
+ }
+
+ response1 = JsonConvert.DeserializeObject<TResponse>(body);
+
+ return response1;
}
-
- return JsonConvert.DeserializeObject<TResponse>(body);
+ catch (Exception ex)
+ {
+ Logger.Add(request == null ? "" : JsonConvert.SerializeObject(request), response1 == null ? ex.ToString() : JsonConvert.SerializeObject(response1));
+ throw new Exception(ex.Message);
+ }
+ finally
+ {
+ Logger.Add(request == null ? "" : JsonConvert.SerializeObject(request), response1 == null ? "" : JsonConvert.SerializeObject(response1));
+ }
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/MESOperation/FeedbackMesService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/MESOperation/FeedbackMesService.cs"
index 8f2dd52..bc18e9c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/MESOperation/FeedbackMesService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/MESOperation/FeedbackMesService.cs"
@@ -12,6 +12,7 @@
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Helper;
using WIDESEA_Core.HttpContextUser;
+using WIDESEA_Core.LogHelper;
using WIDESEA_Core.Util;
using WIDESEA_DTO.Base;
using WIDESEA_DTO.ReturnMES;
@@ -42,12 +43,13 @@
public WebResponseContent OutboundFeedback(string orderNo)
{
+ WebResponseContent webResponse = new WebResponseContent();
try
{
Dt_OutboundOrder outboundOrder = _outboundOrderRepository.Db.Queryable<Dt_OutboundOrder>().Where(x => x.OrderNo == orderNo).Includes(x => x.Details).First();
if (outboundOrder == null)
{
- return WebResponseContent.Instance.Error($"鏈壘鍒板搴旂殑鍑哄簱鍗曚俊鎭�");
+ return webResponse = WebResponseContent.Instance.Error($"鏈壘鍒板搴旂殑鍑哄簱鍗曚俊鎭�");
}
List<Dt_MesReturnRecord> returnRecords = BaseDal.QueryData(x => x.OrderNo == orderNo && x.OrderId == outboundOrder.Id && x.ReturnStatus == 2);
@@ -91,12 +93,12 @@
MaterialOutboundReturnDTO? returnDTO = BuildOutboundFeedbackData(outboundOrder);
if (returnDTO == null)
{
- return WebResponseContent.Instance.Error($"鏋勫缓鍥炶皟瀵硅薄澶辫触");
+ return webResponse = WebResponseContent.Instance.Error($"鏋勫缓鍥炶皟瀵硅薄澶辫触");
}
if (returnDTO.Details.Count <= 0)
{
- return WebResponseContent.Instance.Error($"璇ュ崟鎹棤鏄庣粏鍙洖浼�");
+ return webResponse = WebResponseContent.Instance.Error($"璇ュ崟鎹棤鏄庣粏鍙洖浼�");
}
string apiUrl = AppSettings.GetValue("MaterialOutboundFeedbackUrl");
@@ -116,18 +118,18 @@
Dt_AllocateOrder allocateOrder = _allocateRepository.QueryFirst(x => x.OrderNo == outboundOrder.OrderNo);
if (allocateOrder == null)
{
- return WebResponseContent.Instance.Error($"鏈壘鍒板搴旂殑璋冩嫧鍗�");
+ return webResponse = WebResponseContent.Instance.Error($"鏈壘鍒板搴旂殑璋冩嫧鍗�");
}
AllocationReturnDTO? returnDTO = BuildAllocationFeedbackData(outboundOrder, allocateOrder.FromWarehouse, allocateOrder.ToWarehouse);
if (returnDTO == null)
{
- return WebResponseContent.Instance.Error($"鏋勫缓鍥炶皟瀵硅薄澶辫触");
+ return webResponse = WebResponseContent.Instance.Error($"鏋勫缓鍥炶皟瀵硅薄澶辫触");
}
if (returnDTO.Details.Count <= 0)
{
- return WebResponseContent.Instance.Error($"璇ュ崟鎹棤鏄庣粏鍙洖浼�");
+ return webResponse = WebResponseContent.Instance.Error($"璇ュ崟鎹棤鏄庣粏鍙洖浼�");
}
string apiUrl = AppSettings.GetValue("AllocationFeedbackUrl"); ;
@@ -141,6 +143,8 @@
lineNos = returnDTO.Details.Select(x => x.LineNo).ToList();
httpResponseResult = _httpClientHelper.Post<MesResponseDTO>(apiUrl, requestData);
httpResponseResult.ApiUrl = apiUrl;
+
+ Logger.Add(requestData, httpResponseResult.Serialize());
}
bool isSuccess = httpResponseResult.IsSuccess && httpResponseResult.Data.Code == "200";
@@ -210,14 +214,19 @@
_unitOfWorkManage.CommitTran();
int successCount = returnRecords.Where(x => x.ReturnStatus == 1).Count() + (isSuccess ? 1 : 0);
int failCount = returnRecords.Where(x => x.ReturnStatus == 2).Count() + (isSuccess ? 1 : 0);
- WebResponseContent responseContent = new WebResponseContent();
- responseContent.Status = true;
- responseContent.Message = $"鍥炶皟鎴愬姛鏉℃暟锛歿successCount}锛屽洖璋冨け璐ユ潯鏁帮細{failCount}";
- return responseContent;
+
+ webResponse.Status = true;
+ webResponse.Message = $"鍥炶皟鎴愬姛鏉℃暟锛歿successCount}锛屽洖璋冨け璐ユ潯鏁帮細{failCount}";
+
+ return webResponse;
}
catch (Exception ex)
{
- return WebResponseContent.Instance.Error(ex.Message);
+ return webResponse = WebResponseContent.Instance.Error(ex.Message);
+ }
+ finally
+ {
+ Logger.Add(orderNo, webResponse.Serialize());
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/InboundService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/InboundService.cs"
index 9721aff..f621cae 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/InboundService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/InboundService.cs"
@@ -120,6 +120,7 @@
StockId = stockInfo == null ? 0 : stockInfo.Id,
Barcode = item.Barcode,
MaterielCode = item.MaterielCode,
+ MaterielName = item.MaterielName,
BatchNo = item.BatchNo,
Unit = item.Unit,
InboundOrderRowNo = item.lineNo,
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundService.cs"
index f725af2..c7cd1e8 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundService.cs"
@@ -1435,7 +1435,7 @@
List<Barcodes> barcodesList = new List<Barcodes>();
Barcodes barcodes = new Barcodes
{
- Barcode = newBarcode,
+ Barcode = isUnpacked ? newBarcode : stockDetail?.Barcode,
Qty = barcodeQuantity,
SupplyCode = stockDetail?.SupplyCode ?? "",
BatchNo = stockDetail?.BatchNo ?? "",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Allocate/AllocateOrderController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Allocate/AllocateOrderController.cs"
index 81a2421..ac3c3e1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Allocate/AllocateOrderController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Allocate/AllocateOrderController.cs"
@@ -71,7 +71,7 @@
{
return WebResponseContent.Instance.Error($"鏉＄爜涓嶈兘涓虹┖");
}
- var materialName = _materialInfoRepository.QueryFirst(x => x.MaterielCode == detailDto.materialCode).MaterielName;
+ var materialName = _materialInfoRepository.QueryFirst(x => x.MaterielCode == detailDto.MaterialCode).MaterielName;
if (detailDto.Barcodes != null && detailDto.Barcodes.Any())
{
foreach (var barcodeDto in detailDto.Barcodes)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Jobs/InventoryLockJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Jobs/InventoryLockJob.cs"
index 495eef0..ec6e218 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Jobs/InventoryLockJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Jobs/InventoryLockJob.cs"
@@ -22,13 +22,13 @@
{
// 绗竴姝ワ細鏇存柊ValidDate鐨勫師鐢烻QL锛圫QL Server锛�
- string updateSql = @"
- UPDATE s
- SET s.ValidDate = DATEADD(DAY, m.ValidityDays, s.CreateDate)
- FROM Dt_StockInfoDetail s
- INNER JOIN Dt_MaterialExpirationDate m ON SUBSTRING(s.MaterielCode, 1, 6) = m.MaterialCode
- WHERE s.ValidDate IS NULL";
- int updateValidDateResult = _db.Ado.ExecuteCommand(updateSql);
+ // string updateSql = @"
+ //UPDATE s
+ //SET s.ValidDate = DATEADD(DAY, m.ValidityDays, s.CreateDate)
+ //FROM Dt_StockInfoDetail s
+ //INNER JOIN Dt_MaterialExpirationDate m ON SUBSTRING(s.MaterielCode, 1, 6) = m.MaterialCode
+ //WHERE s.ValidDate IS NULL";
+ // int updateValidDateResult = _db.Ado.ExecuteCommand(updateSql);
// 绗簩姝ワ細鏇存柊杩囨湡鐘舵�佺殑鍘熺敓SQL
string updateStatusSql = @"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Jobs/QuartzJobMildd.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Jobs/QuartzJobMildd.cs"
index e179ff3..09e3e2e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Jobs/QuartzJobMildd.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Jobs/QuartzJobMildd.cs"
@@ -21,20 +21,20 @@
{
var allQzServices = new List<TasksQz>()
{
- //new TasksQz()
- //{
- // Id = 1,
- // AssemblyName = "WIDESEA_WMSServer",
- // ClassName = "AgvTaskJob",
- // CreateTime = DateTime.Now,
- // IntervalSecond = 3,
- // IsDeleted = false,
- // IsStart = false,
- // JobGroup = "WIDESEA_WMSServer",
- // Name = "AgvTaskJob",
- // TriggerType = 0
- //},
-
+ new TasksQz()
+ {
+ Id = 1,
+ AssemblyName = "WIDESEA_WMSServer",
+ ClassName = "AgvTaskJob",
+ CreateTime = DateTime.Now,
+ IntervalSecond = 3,
+ IsDeleted = false,
+ IsStart = false,
+ JobGroup = "WIDESEA_WMSServer",
+ Name = "AgvTaskJob",
+ TriggerType = 0
+ },
+
};
foreach (var item in allQzServices)
{
--
Gitblit v1.9.3