1.ERP修改 2.其他出库优化 3.生产领料新增开工时间

南骏 池

2025-09-05 a39e1db786da4d91121c11844b87a5e5e84e8a86

1.ERP修改
2.其他出库优化
3.生产领料新增开工时间

 Config/appsettings.json

@@ -8,15 +8,23 @@
  "AllowedHosts": "*",
  "AppSettings": {
    "TestErpUrl": "http://192.168.1.149:8066/WebService1.asmx/MesToErpinfoTest",
    "ProductionErpUrl": "http://192.168.1.149:8066/WebService1.asmx/MesToErpinfoTest",
    "ProductionErpUrl": "http://192.168.1.149:8066/WebService1.asmx/MesToErpinfoTest"
    //"DataBaseConn": "Data Source=192.168.1.146;Initial Catalog=TEST_MES;User ID=sa;Password =qixi123;Encrypt=True;TrustServerCertificate=True;"
    "DataBaseConn": "Data Source=192.168.1.146;Initial Catalog=GS_MES;User ID=mesUser;Password =qixi1qaz@WSXmes;Encrypt=True;TrustServerCertificate=True;"
    //"DataBaseConn": "Data Source=192.168.1.146;Initial Catalog=GS_MES;User ID=mesUser;Password =qixi1qaz@WSXmes;Encrypt=True;TrustServerCertificate=True;"
  },
  //"Version": "1.0.0",
  //"X-KDApi-AcctID": "683e92c7f92688",
  //"X-KDApi-UserName": "MES",
  //"X-KDApi-AppID": "315464_W58Nw/DtRIpUxewFR6WpRZzN5qT62BPK",
  //"X-KDApi-AppSec": "f853011716de43589aade7b9dbbbe9e6",
  //"X-KDApi-LCID": "2052",
  //"X-KDApi-ServerUrl": "http://192.168.1.141/k3cloud/",

  "Version": "1.0.0",
  "X-KDApi-AcctID": "683e92c7f92688",
  "X-KDApi-UserName": "MES",
  "X-KDApi-AppID": "315464_W58Nw/DtRIpUxewFR6WpRZzN5qT62BPK",
  "X-KDApi-AppSec": "f853011716de43589aade7b9dbbbe9e6",
  "X-KDApi-AcctID": "6704a3360dafca",
  "X-KDApi-UserName": "GS_MES",
  "X-KDApi-AppID": "322643_SYeD28kvynn+4V9tX4XKSb1HRM66QpnI",
  "X-KDApi-AppSec": "aac3bd55e1f542bd85ca69c7419d9d8f",
  "X-KDApi-LCID": "2052",
  "X-KDApi-ServerUrl": "http://192.168.1.141/k3cloud/"
  "X-KDApi-ServerUrl": "http://192.168.1.141/K3Cloud/"
}

 Controllers/Warehouse/MesItemQtController.cs

@@ -1,6 +1,7 @@
using System.Dynamic;
using Microsoft.AspNetCore.Mvc;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.service.@base;
using NewPdaSqlServer.service.Warehouse;
using NewPdaSqlServer.util;

@@ -14,6 +15,8 @@
public class MesItemQtController : BaseController
{
    private readonly MesItemQtManager _manager = new();

    private readonly MesPrintMangeer _mCf = new();

    #region 基础CRUD

@@ -133,13 +136,38 @@
    [HttpPost("OutScanBarcode")]
    public ResponseResult OutScanBarcode([FromBody] WarehouseQuery query)
    {
        //try
        //{
        //    dynamic resultInfos = new ExpandoObject();
        //    var (form, items, message) = _manager.OutScanBarcode(query);
        //    resultInfos.form = form;
        //    resultInfos.items = items;
        //    resultInfos.message = message;
        //    return new ResponseResult
        //    {
        //        status = 0,
        //        message = "OK",
        //        data = resultInfos
        //    };
        //}
        //catch (Exception ex)
        //{
        //    return ResponseResult.ResponseError(ex);
        //}

        try
        {
            dynamic resultInfos = new ExpandoObject();
            var (form, items, message) = _manager.OutScanBarcode(query);
            resultInfos.form = form;
            resultInfos.items = items;
            resultInfos.message = message;
            resultInfos.tbBillList = _manager.ScanCode(query);
            if (resultInfos.tbBillList.result == "2")
            {
                return new ResponseResult
                {
                    status = Convert.ToInt32(resultInfos.tbBillList.result),
                    message = resultInfos.tbBillList.strMsg,
                    data = resultInfos
                };
            }
            return new ResponseResult
            {
                status = 0,
@@ -197,5 +225,29 @@
        }
    }


    [HttpPost("ScanCodeCF")]
    public ResponseResult ScanCodeCF(WarehouseQuery query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = new ExpandoObject();
            resultInfos.tbBillList.printInfo = _mCf.getPrintInfo(query);
            var scanResult = _manager.ScanCodeCF(query);
            resultInfos.tbBillList.cfBarInfo = _mCf.getCfInfo(scanResult);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    #endregion
}

 Dto/service/ProductionPickDto.cs

@@ -19,6 +19,8 @@
    //拆分后条码
    public string? cfBarcode { get; set; }

    public string? startTime { get; set; }

    //返回信息
    public string? strMsg { get; set; }
    //返回参数类型 -1：失败 1：成功 

 entity/Womdaa.cs

@@ -419,4 +419,10 @@
    /// </summary>
    [SugarColumn(ColumnName = "sj_xt")]
    public string? SjXt { get; set; }

    /// <summary>
    ///     实际线体编码
    /// </summary>
    [SugarColumn(ColumnName = "mes_start_prod")]
    public string? mesStartProd { get; set; }
}

 service/Warehouse/MesItemQtManager.cs

@@ -1,9 +1,12 @@
using NewPdaSqlServer.DB;
using Masuit.Tools;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
using NewPdaSqlServer.entity.Base;
using NewPdaSqlServer.util;
using SqlSugar;
using System.Data;
using System.Data.SqlClient;
using static Microsoft.EntityFrameworkCore.DbLoggerCategory;

namespace NewPdaSqlServer.service.Warehouse;
@@ -74,7 +77,8 @@
            return new
            {
                items = items,
                ysitems = ysitems
                ysitems = ysitems,
                allList = blDetails,
            };
        }
        catch (Exception ex)
@@ -881,4 +885,140 @@
        });
        return (query, mesItemQtDatalls, message);
    }


    /// <summary>
    /// 其他出库（新）存储过程
    /// </summary>
    /// <param name="query"></param>
    /// <returns></returns>
    /// <exception cref="Exception"></exception>
    public ProductionPickDto ScanCode(WarehouseQuery query)
    {
        var _strMsg = "";
        var _intSum = "";
        using (var conn = new SqlConnection(DbHelperSQL.strConn))
        {
            if (query.userName.IsNullOrEmpty()) throw new Exception("用户名不允许为空");
            if (query.billNo.IsNullOrEmpty()) throw new Exception("申请单号不允许为空"); if (query.barcode.IsNullOrEmpty()) throw new Exception("条码不允许为空");

            using (var cmd = new SqlCommand("[prc_pda_QTCK]", conn))
            {
                try
                {
                    conn.Open();
                    cmd.CommandType = CommandType.StoredProcedure;
                    SqlParameter[] parameters =
                    {
                        new("@outMsg", SqlDbType.NVarChar, 300),
                        new("@outSum", SqlDbType.NVarChar, 300),
                        new("@barcode_num", SqlDbType.NVarChar, 300),
                        new("@split_num", SqlDbType.NVarChar, 300),
                        new("@c_User", query.userName),
                        new("@p_biLL_no", query.billNo),
                        new("@p_item_barcode", query.barcode)
                    };
                    parameters[0].Direction = ParameterDirection.Output;
                    parameters[1].Direction = ParameterDirection.Output;
                    parameters[2].Direction = ParameterDirection.Output;
                    parameters[3].Direction = ParameterDirection.Output;
                    foreach (var parameter in parameters)
                        cmd.Parameters.Add(parameter);
                    cmd.ExecuteNonQuery();
                    _strMsg = parameters[0].Value.ToString();
                    _intSum = parameters[1].Value.ToString();

                    var barcodeNum = parameters[2].Value.ToString();
                    var splitNum = parameters[3].Value.ToString();

                    var result = Convert.ToInt32(_intSum);
                    if (result <= 0) throw new Exception(_strMsg);

                    var dto = new ProductionPickDto
                    {
                        daa001 = query.billNo,
                        barcodeNum = barcodeNum,
                        splitNum = splitNum,
                        barcode = query.barcode,
                        result = result.ToString()
                    };

                    return dto;
                }
                catch (Exception ex)
                {
                    throw new Exception(ex.Message);
                }
                finally
                {
                    conn.Close();
                }
            }
        }
    }


    public ProductionPickDto ScanCodeCF(WarehouseQuery query)
    {
        if (query.userName.IsNullOrEmpty()) throw new Exception("用户名不允许为空");
        if (query.billNo.IsNullOrEmpty()) throw new Exception("申请单号不允许为空");
        if (query.barcode.IsNullOrEmpty()) throw new Exception("条码不允许为空");

        if (query.Num is null or 0) throw new Exception("条码拆分数不允许为空或者为0");

        var _strMsg = "";
        var _intSum = "";
        var _cfBar = "";//拆分后条码
        using (var conn = new SqlConnection(DbHelperSQL.strConn))
        {
            using (var cmd = new SqlCommand("[prc_pda_QTCK_CF]", conn))
            {
                try
                {
                    conn.Open();
                    cmd.CommandType = CommandType.StoredProcedure;
                    SqlParameter[] parameters =
                    {
                        new("@outMsg", SqlDbType.NVarChar, 2000),
                        new("@outSum", SqlDbType.NVarChar, 300),
                        new("@outCfBar", SqlDbType.NVarChar, 300),
                        new("@c_User", query.userName),
                        new("@p_biLL_no", query.billNo),
                        new("@p_item_barcode", query.barcode),
                        new("@num", query.Num)
                    };
                    parameters[0].Direction = ParameterDirection.Output;
                    parameters[1].Direction = ParameterDirection.Output;
                    parameters[2].Direction = ParameterDirection.Output;
                    foreach (var parameter in parameters)
                        cmd.Parameters.Add(parameter);
                    cmd.ExecuteNonQuery();
                    _strMsg = parameters[0].Value.ToString();
                    _intSum = parameters[1].Value.ToString();
                    _cfBar = parameters[2].Value.ToString();


                    var result = Convert.ToInt32(_intSum);
                    if (result <= 0) throw new Exception(_strMsg);

                    var dto = new ProductionPickDto
                    {
                        daa001 = query.billNo,
                        barcode = query.barcode,//原条码
                        cfBarcode = _cfBar//拆分后条码
                    };

                    return dto;
                }
                catch (Exception ex)
                {
                    throw new Exception(ex.Message);
                }
                finally
                {
                    conn.Close();
                }
            }
        }
    }
}

 service/Wom/WomdaaManager.cs

@@ -74,6 +74,7 @@
        {
            daa001 = query.daa001,
            PlanNo = womcaa.Caa020,
            startTime = womdaa.mesStartProd,
            items = DS_list,
            Ysitems = YS_list
        };