提交

heshaofeng

2025-11-19 cc0fa98f87ea40050a7b3691ade1ed2f2f46357e

提交

 ÏîÄ¿´úÂë/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; /* è°ƒæ•´å­—段容器位置 */
          }
          

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/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);

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/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);
                }