hao
2025-09-16 18b4c6b6060d09e51382024a6e61fe9ef8f18a8c
组织拆卸单测试
已修改2个文件
已添加5个文件
501 ■■■■■ 文件已修改
StandardInterface/MES.Service/Dto/webApi/ERPZZCXD.cs 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/Modes/MessageCenter.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/Modes/Zzcxa.cs 132 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/Modes/Zzcxb.cs 72 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/service/ZZCXDManager.cs 135 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MESApplication/Controllers/ZZCXDController.cs 103 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MESApplication/appsettings.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardInterface/MES.Service/Dto/webApi/ERPZZCXD.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,55 @@
using System.Collections.Generic;
namespace MES.Service.Dto.webApi
{
    /// <summary>
    /// ERP ä¼ è¾“的制造拆卸单(主表 + æ˜Žç»†é›†åˆï¼‰
    /// </summary>
    public class ERPZZCXD
    {
        public ERPZZCXA ERPZZCXA { get; set; } = new ERPZZCXA();
        public List<ERPZZCXB> ERPZZCXB { get; set; } = new List<ERPZZCXB>();
    }
    /// <summary>
    /// ERP åˆ¶é€ æ‹†å¸å• ä¸»è¡¨ DTO
    /// </summary>
    public class ERPZZCXA
    {
        public string? bill_no { get; set; }   // å•据编码
        public string? dj_lx { get; set; }     // å•据类型
        public string? kc_zz { get; set; }     // åº“存组织
        public string? sw_lx { get; set; }     // äº‹åŠ¡ç±»åž‹
        public string? time { get; set; }      // æ—¥æœŸ
        public string? bm { get; set; }        // éƒ¨é—¨
        public string? cgy { get; set; }       // ä»“管员
        public string? kcz { get; set; }       // åº“存组
        public string? dj_zt { get; set; }     // å•据状态
        public string? memo { get; set; }      // å¤‡æ³¨
        public string? cphzlx { get; set; }    // æˆå“è´§ä¸»ç±»åž‹
        public string? cphz { get; set; }      // æˆå“è´§ä¸»
        public string? zjhzlx { get; set; }    // å­ä»¶è´§ä¸»ç±»åž‹
        public string? zjhz { get; set; }      // å­ä»¶è´§ä¸»
        public string? item_id { get; set; }   // ç‰©æ–™ç¼–码id
        public string? qty { get; set; }       // æ•°é‡
        public string? unit { get; set; }      // å•位
        public string? depot_id { get; set; }  // ä»“库
        public string? erpid { get; set; }     // ERP ä¸»è¡¨id
        public string? type { get; set; }
    }
    /// <summary>
    /// ERP åˆ¶é€ æ‹†å¸å• æ˜Žç»† DTO
    /// </summary>
    public class ERPZZCXB
    {
        public string? erpid { get; set; }     // ERP ä¸»è¡¨id
        public string? eid { get; set; }       // ERP å•据头id
        public string? item_id { get; set; }   // ç‰©æ–™ç¼–码id
        public string? qty { get; set; }       // æ•°é‡
        public string? unit { get; set; }      // å•位
        public string? depot_id { get; set; }  // ä»“库
        public string? lot_no { get; set; }    // æ‰¹å·
        public string? memo { get; set; }      // å¤‡æ³¨
    }
}
StandardInterface/MES.Service/Modes/MessageCenter.cs
@@ -10,7 +10,7 @@
    /// <summary>
    ///     å¯¹åº”序列SEQ_MSG
    /// </summary>
    [SugarColumn(IsPrimaryKey = true, OracleSequenceName = "SEQ_MSG",
    [SugarColumn(IsPrimaryKey = true, OracleSequenceName = "SEQ_MSG2",
        ColumnName = "ID")]
    public decimal? Id { get; set; }
StandardInterface/MES.Service/Modes/Zzcxa.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,132 @@
using System;
using SqlSugar;
namespace MES.Service.Modes
{
    /// <summary>
    /// ZZCXA ä¸»è¡¨
    /// </summary>
    [SugarTable("ZZCXA")]
    public class Zzcxa
    {
        /// <summary>
        /// ä¸»é”®ID
        /// </summary>
        [SugarColumn(ColumnName = "ID", IsPrimaryKey = true, OracleSequenceName = "SEQ_ZZCXA")]
        public decimal? Id { get; set; }
        /// <summary>
        /// å•据编码
        /// </summary>
        [SugarColumn(ColumnName = "BILL_NO")]
        public string BillNo { get; set; }
        /// <summary>
        /// å•据类型
        /// </summary>
        [SugarColumn(ColumnName = "DJ_LX")]
        public string DjLx { get; set; }
        /// <summary>
        /// åº“存组织
        /// </summary>
        [SugarColumn(ColumnName = "KC_ZZ")]
        public string KcZz { get; set; }
        /// <summary>
        /// äº‹åŠ¡ç±»åž‹
        /// </summary>
        [SugarColumn(ColumnName = "SW_LX")]
        public string SwLx { get; set; }
        /// <summary>
        /// æ—¥æœŸ
        /// </summary>
        [SugarColumn(ColumnName = "TIME")]
        public string Time { get; set; }
        /// <summary>
        /// éƒ¨é—¨
        /// </summary>
        [SugarColumn(ColumnName = "BM")]
        public string Bm { get; set; }
        /// <summary>
        /// ä»“管员
        /// </summary>
        [SugarColumn(ColumnName = "CGY")]
        public string Cgy { get; set; }
        /// <summary>
        /// åº“存组
        /// </summary>
        [SugarColumn(ColumnName = "KCZ")]
        public string Kcz { get; set; }
        /// <summary>
        /// å•据状态
        /// </summary>
        [SugarColumn(ColumnName = "DJ_ZT")]
        public string DjZt { get; set; }
        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        [SugarColumn(ColumnName = "MEMO")]
        public string Memo { get; set; }
        /// <summary>
        /// æˆå“è´§ä¸»ç±»åž‹
        /// </summary>
        [SugarColumn(ColumnName = "CPHZLX")]
        public string Cphzlx { get; set; }
        /// <summary>
        /// æˆå“è´§ä¸»
        /// </summary>
        [SugarColumn(ColumnName = "CPHZ")]
        public string Cphz { get; set; }
        /// <summary>
        /// å­ä»¶è´§ä¸»ç±»åž‹
        /// </summary>
        [SugarColumn(ColumnName = "ZJHZLX")]
        public string Zjhzlx { get; set; }
        /// <summary>
        /// å­ä»¶è´§ä¸»
        /// </summary>
        [SugarColumn(ColumnName = "ZJHZ")]
        public string Zjhz { get; set; }
        /// <summary>
        /// ç‰©æ–™ç¼–码id
        /// </summary>
        [SugarColumn(ColumnName = "ITEM_ID")]
        public decimal? ItemId { get; set; }
        /// <summary>
        /// æ•°é‡
        /// </summary>
        [SugarColumn(ColumnName = "QTY")]
        public decimal? Qty { get; set; }
        /// <summary>
        /// å•位
        /// </summary>
        [SugarColumn(ColumnName = "UNIT")]
        public string Unit { get; set; }
        /// <summary>
        /// ä»“库
        /// </summary>
        [SugarColumn(ColumnName = "DEPOT_ID")]
        public string DepotId { get; set; }
        /// <summary>
        /// ERP ä¸»è¡¨id
        /// </summary>
        [SugarColumn(ColumnName = "ERPID")]
        public string Erpid { get; set; }
    }
}
StandardInterface/MES.Service/Modes/Zzcxb.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,72 @@
using System;
using SqlSugar;
namespace MES.Service.Modes
{
    /// <summary>
    /// ZZCXB æ˜Žç»†è¡¨
    /// </summary>
    [SugarTable("ZZCXB")]
    public class Zzcxb
    {
        /// <summary>
        /// ä¸»é”®ID
        /// </summary>
        [SugarColumn(ColumnName = "ID", IsPrimaryKey = true, OracleSequenceName = "SEQ_ZZCXB")]
        public decimal? Id { get; set; }
        /// <summary>
        /// ä¸»è¡¨ID
        /// </summary>
        [SugarColumn(ColumnName = "PID")]
        public decimal? Pid { get; set; }
        /// <summary>
        /// ERP ä¸»è¡¨id
        /// </summary>
        [SugarColumn(ColumnName = "ERPID")]
        public string Erpid { get; set; }
        /// <summary>
        /// ERP å•据头id
        /// </summary>
        [SugarColumn(ColumnName = "EID")]
        public string Eid { get; set; }
        /// <summary>
        /// ç‰©æ–™ç¼–码id
        /// </summary>
        [SugarColumn(ColumnName = "ITEM_ID")]
        public decimal? ItemId { get; set; }
        /// <summary>
        /// æ•°é‡
        /// </summary>
        [SugarColumn(ColumnName = "QTY")]
        public decimal? Qty { get; set; }
        /// <summary>
        /// å•位
        /// </summary>
        [SugarColumn(ColumnName = "UNIT")]
        public string Unit { get; set; }
        /// <summary>
        /// ä»“库
        /// </summary>
        [SugarColumn(ColumnName = "DEPOT_ID")]
        public string DepotId { get; set; }
        /// <summary>
        /// æ‰¹å·
        /// </summary>
        [SugarColumn(ColumnName = "LOT_NO")]
        public string LotNo { get; set; }
        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        [SugarColumn(ColumnName = "MEMO")]
        public string Memo { get; set; }
    }
}
StandardInterface/MES.Service/service/ZZCXDManager.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,135 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
namespace MES.Service.service
{
    public class ZzcxdManager : Repository<Zzcxa>
    {
        public bool SaveList(List<ERPZZCXD> list)
        {
            var result = list.Select(Save).ToList();
            return result.All(b => b);
        }
        public bool Save(ERPZZCXD data)
        {
            var head = MapErpToMesHead(data.ERPZZCXA);
            var details = MapErpDbckbToDbckb(data.ERPZZCXB);
            return UseTransaction(db =>
            {
                switch (data.ERPZZCXA.type)
                {
                    case "3":
                        return UpdateData(db, head, details) ? 1 : 0;
                    case "2":
                    case "4":
                    case "5":
                        return SaveOrUpdateData(db, head, details) ? 1 : 0;
                    default:
                        throw new NotImplementedException($"type没有 {data.ERPZZCXA.type} è¿™ä¸ªç±»åž‹");
                }
            }) > 0;
        }
        private Zzcxa MapErpToMesHead(ERPZZCXA dto)
        {
            var entity = new Zzcxa
            {
                BillNo = dto.bill_no,          // å•据编码
                DjLx = dto.dj_lx,              // å•据类型
                KcZz = dto.kc_zz,              // åº“存组织
                SwLx = dto.sw_lx,              // äº‹åŠ¡ç±»åž‹
                Time =  dto.time , // æ—¥æœŸ
                Bm = dto.bm,                   // éƒ¨é—¨
                Cgy = dto.cgy,                 // ä»“管员
                Kcz = dto.kcz,                 // åº“存组
                DjZt = dto.dj_zt,              // å•据状态
                Memo = dto.memo,               // å¤‡æ³¨
                Cphzlx = dto.cphzlx,           // æˆå“è´§ä¸»ç±»åž‹
                Cphz = dto.cphz,               // æˆå“è´§ä¸»
                Zjhzlx = dto.zjhzlx,           // å­ä»¶è´§ä¸»ç±»åž‹
                Zjhz = dto.zjhz,               // å­ä»¶è´§ä¸»
                ItemId = string.IsNullOrEmpty(dto.item_id) ? null : Convert.ToDecimal(dto.item_id), // ç‰©æ–™ç¼–码id
                Qty = string.IsNullOrEmpty(dto.qty) ? null : Convert.ToDecimal(dto.qty),            // æ•°é‡
                Unit = dto.unit,               // å•位
                DepotId = dto.depot_id,        // ä»“库
                Erpid = dto.erpid              // ERP ä¸»è¡¨id
            };
            var single = Db.Queryable<Zzcxa>()
                           .Where(it => it.Erpid == entity.Erpid)
                           .First();
            if (single != null)
                entity.Id = single.Id;
            return entity;
        }
        private List<Zzcxb> MapErpDbckbToDbckb(List<ERPZZCXB> list)
        {
            var result = new List<Zzcxb>();
            foreach (var dto in list)
            {
                var item = new Zzcxb
                {
                    Erpid = dto.erpid,               // ERP ä¸»è¡¨id
                    Eid = dto.eid,                   // ERP å•据头id
                    ItemId = string.IsNullOrEmpty(dto.item_id) ? null : Convert.ToDecimal(dto.item_id), // ç‰©æ–™ç¼–码id
                    Qty = string.IsNullOrEmpty(dto.qty) ? null : Convert.ToDecimal(dto.qty),            // æ•°é‡
                    Unit = dto.unit,                 // å•位
                    DepotId = dto.depot_id,          // ä»“库
                    LotNo = dto.lot_no,              // æ‰¹å·
                    Memo = dto.memo                  // å¤‡æ³¨
                };
                var existing = Db.Queryable<Zzcxb>().Where(s => s.Erpid == item.Erpid).Single();
                if (existing != null) item.Id = existing.Id;
                result.Add(item);
            }
            return result;
        }
        private bool SaveOrUpdateData(SqlSugarScope db, Zzcxa head, List<Zzcxb> details)
        {
            if (head.Id != null)
                base.DeleteById(head.Id);
            db.Deleteable<Zzcxb>()
              .Where(d => d.Eid == head.Erpid)
              .ExecuteCommand();
            var insertedHead = db.Insertable(head)
                .IgnoreColumns(true)
                .ExecuteReturnIdentity();
            if (insertedHead <= 0)
                throw new Exception("主表插入失败,未返回ID");
            var success = db.Insertable(details)
                .PageSize(10)
                .IgnoreColumnsNull()
                .ExecuteCommand() > 0;
            if (insertedHead >= 0 && success) return true;
            throw new NotImplementedException("插入或更新失败");
        }
        private bool UpdateData(SqlSugarScope db, Zzcxa head, List<Zzcxb> details)
        {
            var ids = details.Select(d => d.Id).ToArray();
            var deletedHead = base.DeleteById(head.Id);
            var deletedDetails = db.Deleteable<Zzcxb>().In(ids).ExecuteCommand() > 0;
            if (deletedHead && deletedDetails) return true;
            throw new NotImplementedException("更新失败");
        }
    }
}
StandardInterface/MESApplication/Controllers/ZZCXDController.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,103 @@
using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic;
using System.Dynamic;
using MES.Service.service;
using MES.Service.Dto.webApi;
using MES.Service.util;
using Newtonsoft.Json;
using MES.Service.Modes;
namespace MESApplication.Controllers
{
    [ApiController]
    [Route("api/[controller]")]
    public class ZZCXDController : ControllerBase
    {
        private readonly ZzcxdManager _manager = new();   // è¿™é‡Œå¯¹åº”æ–°çš„ Service
        private readonly MessageCenterManager _messageManager = new();
        private const string METHOD = "POST";
        private const string TableName = "ZZCXD";
        private const string URL = "http://localhost:10054/api/ERPZZCXD/";
        /// <summary>
        /// ä¿å­˜å•条调拨单
        /// </summary>
        [HttpPost("Save")]
        public ResponseResult Save([FromBody] ERPZZCXD data)
        {
            var msg = new MessageCenter
            {
                TableName = TableName,
                Url = URL + "Save",
                Method = METHOD,
                Data = JsonConvert.SerializeObject(data),
                Status = 1,
                CreateBy = "PL017",
                Route = data.ERPZZCXA.bill_no   // æ³¨æ„å– billno
            };
            try
            {
                dynamic resultInfos = new ExpandoObject();
                var success = _manager.Save(data);
                resultInfos.tbBillList = success;
                msg.Result = success ? (short?)1 : (short?)0;
                msg.DealWith = 1;
                _messageManager.save(msg);
                return new ResponseResult { status = 0, message = "OK", data = resultInfos };
            }
            catch (Exception ex)
            {
                msg.Result = 0;
                msg.DealWith = 0;
                msg.ResultData = ex.Message;
                _messageManager.save(msg);
                return ResponseResult.ResponseError(ex);
            }
        }
        /// <summary>
        /// æ‰¹é‡ä¿å­˜è°ƒæ‹¨å•
        /// </summary>
        [HttpPost("SaveList")]
        public ResponseResult SaveList([FromBody] List<ERPZZCXD> dataList)
        {
            var msg = new MessageCenter
            {
                TableName = TableName,
                Url = URL + "SaveList",
                Method = METHOD,
                Data = JsonConvert.SerializeObject(dataList),
                Status = 1,
                CreateBy = "PL017"
            };
            try
            {
                dynamic resultInfos = new ExpandoObject();
                var success = _manager.SaveList(dataList);
                resultInfos.tbBillList = success;
                msg.Result = success ? (short?)1 : (short?)0;
                msg.DealWith = 1;
                _messageManager.save(msg);
                return new ResponseResult { status = 0, message = "OK", data = resultInfos };
            }
            catch (Exception ex)
            {
                msg.Result = 0;
                msg.DealWith = 0;
                msg.ResultData = ex.Message;
                _messageManager.save(msg);
                return ResponseResult.ResponseError(ex);
            }
        }
    }
}
StandardInterface/MESApplication/appsettings.json
@@ -10,6 +10,6 @@
  "AppSettings": {
    "TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo",
    "ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal",
    "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.22)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = hm_prd; Password=hmprd"
    "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.22)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = test_dev; Password=hmprd"
  }
}