Merge branch 'master' of http://43.142.96.171:8080/r/~yhj/HM_JK

hao

2025-06-13 93e6a8bf1c1d3586528978f614b17c9aa1f9734e

Merge branch 'master' of http://43.142.96.171:8080/r/~yhj/HM_JK

 StandardInterface/MES.Service/Dto/webApi/SRM/DeliveryItem.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
namespace MES.Service.Dto.webApi.SRM;

public class DeliveryItem
{
    public string? DeliveryNo { get; set; }
    public string? ItemNo { get; set; }
}

 StandardInterface/MES.Service/Dto/webApi/SRM/DeliveryNoteDetail.cs

@@ -14,4 +14,6 @@
    public string? FBillNo { get; set; }
    public string? OrderlineId { get; set; }
    public string? DepotNo { get; set; }

    public string? IsGift { get; set; }
}

 StandardInterface/MES.Service/MES.Service.csproj

@@ -24,7 +24,6 @@
    </ItemGroup>

    <ItemGroup>
      <Folder Include="Dto\webApi\SRM\" />
      <Folder Include="Modes\SRM\" />
      <Folder Include="service\SRM\" />
    </ItemGroup>

 StandardInterface/MES.Service/Modes/SRM/MesDeliveryNoteDetails.cs

@@ -63,4 +63,8 @@
    //收货仓库
    [SugarColumn(ColumnName = "DEPOT_CODE")]
    public string? DepotCode { get; set; }

    //是否赠品
    [SugarColumn(ColumnName = "IS_GIFT")]
    public string? IsGift { get; set; }
}

 StandardInterface/MES.Service/service/SRM/MesDeliveryNoteBarcodeManager.cs

@@ -50,6 +50,32 @@
        return result.All(b => b);
    }

    public dynamic DeleteByItem(DeliveryItem dt)
    {
        return UseTransaction(db =>
        {
            return DeleteDataByItem(db, dt) ? 1 : 0;
        }) > 0;
    }

    public dynamic DeleteListByItem(List<DeliveryItem> dts)
    {
        var result = dts.Select(DeleteByItem).ToList();
        return result.All(b => b);
    }

    // åˆ é™¤æ•°æ®çš„方法
    private bool DeleteDataByItem(SqlSugarScope db, DeliveryItem dt)
    {
        var del = db.Deleteable<MesDeliveryNoteBarcode>().Where(s => s.DeliveryNo == dt.DeliveryNo && s.ProductCode==dt.ItemNo).ExecuteCommand() > 0;

        if (del)
        {
            return true;
        }
        throw new NotImplementedException("删除失败");
    }

    // åˆ é™¤æ•°æ®çš„方法
    private bool DeleteData(SqlSugarScope db, ErpBarcode barcode)
    {

 StandardInterface/MES.Service/service/SRM/MesDeliveryNoteManager.cs

@@ -112,7 +112,8 @@
                CreateDate = DateTime.Now,
                PurchaseQty = Convert.ToDecimal(s.PurchaseQty),
                IncludeQty = Convert.ToDecimal(s.IncludeQty),
                DepotCode = s.DepotNo
                DepotCode = s.DepotNo,
                IsGift = s.IsGift
            };
            return entity;
        }).ToList();

 StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteBarcodeController.cs

@@ -286,5 +286,94 @@
        }
    }

    [HttpPost("DeleteByItem")]
    public ResponseResult DeleteByItem(DeliveryItem dt)
    {
        var entity = new MessageCenter();
        entity.TableName = TableName;
        entity.Url = URL + "DeleteByItem";
        entity.Method = METHOD;
        entity.Data = JsonConvert.SerializeObject(dt);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var save = m.DeleteByItem(dt);
            resultInfos = save;

            entity.Result = 0;
            if (save) entity.Result = 1;

            entity.DealWith = 1;
            _manager.save(entity);

            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            entity.Result = 0;

            entity.DealWith = 0;

            entity.ResultData = ex.Message;

            _manager.save(entity);

            return ResponseResult.ResponseError(ex);
        }
    }

    [HttpPost("DeleteListByItem")]
    public ResponseResult DeleteListByItem(List<DeliveryItem> dts)
    {
        var entity = new MessageCenter();
        entity.TableName = TableName;
        entity.Url = URL + "DeleteListByItem";
        entity.Method = METHOD;
        entity.Data = JsonConvert.SerializeObject(dts);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var save = m.DeleteListByItem(dts);
            resultInfos = save;

            entity.Result = 0;
            if (save) entity.Result = 1;

            entity.DealWith = 1;
            _manager.save(entity);

            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            entity.Result = 0;

            entity.DealWith = 0;

            entity.ResultData = ex.Message;

            _manager.save(entity);

            return ResponseResult.ResponseError(ex);
        }
    }




}