From cc0fa98f87ea40050a7b3691ade1ed2f2f46357e Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期三, 19 十一月 2025 19:45:59 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs | 3 ++-
项目代码/WIDESEA_WMSClient/src/extension/inbound/Dt_MaterielToMes.js | 7 +++----
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ESSController.cs | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/Dt_MaterielToMes.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/Dt_MaterielToMes.js"
index 02aeab4..7c0a3b6 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/Dt_MaterielToMes.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/Dt_MaterielToMes.js"
@@ -76,12 +76,11 @@
}
.material-card {
- border: 1px solid #000;
padding: 5mm; /* 浣跨敤姣背鍗曚綅鏇撮�傞厤鎵撳嵃灏哄 */
font-size: 2mm; /* 鎸夋瘮渚嬬缉灏忓瓧浣� */
position: relative;
- width: 70mm; /* 鐣ュ皬浜庣焊寮犲搴︼紝鐣欒竟璺� */
- height: 50mm; /* 鐣ュ皬浜庣焊寮犻珮搴︼紝鐣欒竟璺� */
+ width: 80mm; /* 鐣ュ皬浜庣焊寮犲搴︼紝鐣欒竟璺� */
+ height: 60mm; /* 鐣ュ皬浜庣焊寮犻珮搴︼紝鐣欒竟璺� */
box-sizing: border-box; /* 纭繚padding涓嶅奖鍝嶆暣浣撳昂瀵� */
}
@@ -97,7 +96,7 @@
display: flex;
flex-wrap: wrap;
justify-content: space-between;
- gap: 1.5mm; /* 缂╁皬闂磋窛 */
+ gap:1.5mm; /* 缂╁皬闂磋窛 */
margin-top: 8mm; /* 璋冩暣瀛楁瀹瑰櫒浣嶇疆 */
}
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/InboundOrderService.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/InboundOrderService.cs"
index c7fa1c9..ad1053f 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/InboundOrderService.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/InboundOrderService.cs"
@@ -186,7 +186,8 @@
_unitOfWorkManage.BeginTran();
foreach (var item in deletePurchaseOrderDetails)
{
- _inboundOrderDetailRepository.DeleteAndMoveIntoHty(item, OperateTypeEnum.鑷姩鍒犻櫎);
+ _inboundOrderDetailRepository.DeleteData(item);
+ //_inboundOrderDetailRepository.DeleteAndMoveIntoHty(item, OperateTypeEnum.鑷姩鍒犻櫎);
}
_inboundOrderDetailRepository.UpdateData(updateInboundOrderDetails);
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/ESSController.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/ESSController.cs"
index fac8d08..56269a8 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/ESSController.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/ESSController.cs"
@@ -76,7 +76,7 @@
return Ok(response);
}
- var result = await _taskService.RequestInboundTask(request.ContainerCode, request.SlotCode);
+ WebResponseContent result = await _taskService.RequestInboundTask(request.ContainerCode, request.SlotCode);
var cacheOptions = new MemoryCacheEntryOptions
{
@@ -92,7 +92,7 @@
direction = "100"
}
};
- if (result != null && result.Message.Contains("璇ユ墭鐩樺凡鐢熸垚浠诲姟"))
+ if (result != null && result.Message != null && result.Message.Contains("璇ユ墭鐩樺凡鐢熸垚浠诲姟"))
{
return Ok(response);
}
--
Gitblit v1.9.3