Skip to content

J
JunmpPoliceStation
Commit 663e2ed5 by zxw
Options

Merge branch 'master' into zxw

parents 8de6fa57 a8f42e6a
正在显示 包含 178 行增加 和 119 行删除
JmpModel/Model/BaseJpCabinetWorklog.cs
...@@ -27,7 +27,7 @@ namespace JmpModel.Model ...@@ -27,7 +27,7 @@ namespace JmpModel.Model
[StringLength(50)] [StringLength(50)]
public string Date { get; set; } public string Date { get; set; }
[Column("photo")] [Column("photo")]
[StringLength(50)] [StringLength(255)]
public string Photo { get; set; } public string Photo { get; set; }
[Column("isDeal")] [Column("isDeal")]
[StringLength(50)] [StringLength(50)]
......
JmpModel/Model/DataContext/JunmppolicesqlContext.cs
...@@ -3540,6 +3540,8 @@ Warehouse：仓库"); ...@@ -3540,6 +3540,8 @@ Warehouse：仓库");
entity.Property(e => e.EquipmentCode).IsUnicode(false); entity.Property(e => e.EquipmentCode).IsUnicode(false);
entity.Property(e => e.EquipmentCode1).IsUnicode(false);
entity.Property(e => e.EquipmentName).IsUnicode(false); entity.Property(e => e.EquipmentName).IsUnicode(false);
entity.Property(e => e.EquipmentSizecode).IsUnicode(false); entity.Property(e => e.EquipmentSizecode).IsUnicode(false);
...@@ -3754,6 +3756,8 @@ Warehouse：仓库"); ...@@ -3754,6 +3756,8 @@ Warehouse：仓库");
entity.Property(e => e.Order).IsUnicode(false); entity.Property(e => e.Order).IsUnicode(false);
entity.Property(e => e.PrintOrderCode).IsUnicode(false);
entity.Property(e => e.WarehouseId).IsUnicode(false); entity.Property(e => e.WarehouseId).IsUnicode(false);
entity.Property(e => e.WarehouseName).IsUnicode(false); entity.Property(e => e.WarehouseName).IsUnicode(false);
......
JmpModel/Model/ViewEquipment.cs
...@@ -47,6 +47,9 @@ namespace JmpModel.Model ...@@ -47,6 +47,9 @@ namespace JmpModel.Model
[Column("equipment_name")] [Column("equipment_name")]
[StringLength(64)] [StringLength(64)]
public string EquipmentName { get; set; } public string EquipmentName { get; set; }
[Column("equipmentCode")]
[StringLength(36)]
public string EquipmentCode1 { get; set; }
[Column("equipment_sizecode")] [Column("equipment_sizecode")]
[StringLength(36)] [StringLength(36)]
public string EquipmentSizecode { get; set; } public string EquipmentSizecode { get; set; }
......
JmpModel/Model/ViewOutInOrder.cs
...@@ -27,5 +27,10 @@ namespace JmpModel.Model ...@@ -27,5 +27,10 @@ namespace JmpModel.Model
public DateTime? CreateTime { get; set; } public DateTime? CreateTime { get; set; }
[Column("type")] [Column("type")]
public int Type { get; set; } public int Type { get; set; }
[Column("print_order_code")]
[StringLength(255)]
public string PrintOrderCode { get; set; }
[Column("print_order_time", TypeName = "datetime")]
public DateTime? PrintOrderTime { get; set; }
} }
} }
\ No newline at end of file
JmpModel/efpt.config.json
...@@ -435,7 +435,7 @@ ...@@ -435,7 +435,7 @@
"ObjectType": 3 "ObjectType": 3
} }
], ],
"UiHint": "pc.junmppolicesqldev.dbo", "UiHint": "PC.junmppolicesqldev",
"UseBoolPropertiesWithoutDefaultSql": false, "UseBoolPropertiesWithoutDefaultSql": false,
"UseDatabaseNames": false, "UseDatabaseNames": false,
"UseDbContextSplitting": false, "UseDbContextSplitting": false,
......
JunmpPoliceStation/Controllers/BaseCharge.cs
...@@ -52,6 +52,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -52,6 +52,7 @@ namespace JunmpPoliceStation.Controllers
/// <param name="jdata"></param> /// <param name="jdata"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("AddChargeDevelop")] [HttpPost("AddChargeDevelop")]
[ServiceFilter(typeof(ActionLimitAttribute))]
public async Task<HttpResponseMessage> AddChargeDevelop([FromBody] JObject jdata) public async Task<HttpResponseMessage> AddChargeDevelop([FromBody] JObject jdata)
{ {
...@@ -59,79 +60,81 @@ namespace JunmpPoliceStation.Controllers ...@@ -59,79 +60,81 @@ namespace JunmpPoliceStation.Controllers
{ {
try try
{ {
if (jdata != null) //if (jdata != null)
{ //{
var entity = JsonManager.GetJsonEntity(jdata); // var entity = JsonManager.GetJsonEntity(jdata);
if (entity == null) // if (entity == null)
{ // {
return JsonManager.SimpleStatusResponse(ResultCode.OPERATE_FAILED); // return JsonManager.SimpleStatusResponse(ResultCode.OPERATE_FAILED);
} // }
//第三方调用接口验证orgId正确性 // //第三方调用接口验证orgId正确性
if (!string.IsNullOrEmpty(entity._PUSHORG)) // if (!string.IsNullOrEmpty(entity._PUSHORG))
{ // {
if (entity.orgId?.ToString() != entity._PUSHORG.ToString()) // if (entity.orgId?.ToString() != entity._PUSHORG.ToString())
{ // {
return JsonManager.SimpleStatusResponse(ResultCode.ORGANIZATION_ERROR); // return JsonManager.SimpleStatusResponse(ResultCode.ORGANIZATION_ERROR);
} // }
} // }
if (string.IsNullOrEmpty(entity.orgId ?? "")) // if (string.IsNullOrEmpty(entity.orgId ?? ""))
{ // {
return JsonManager.SimpleCustResponse($"orgId is require"); // return JsonManager.SimpleCustResponse($"orgId is require");
} // }
else if (string.IsNullOrEmpty(entity.equName ?? "")) // else if (string.IsNullOrEmpty(entity.equName ?? ""))
{ // {
return JsonManager.SimpleCustResponse($"equName is require"); // return JsonManager.SimpleCustResponse($"equName is require");
} // }
else if (string.IsNullOrEmpty(entity.equCode ?? "")) // else if (string.IsNullOrEmpty(entity.equCode ?? ""))
{ // {
return JsonManager.SimpleCustResponse($"equCode is require"); // return JsonManager.SimpleCustResponse($"equCode is require");
} // }
else if (string.IsNullOrEmpty(entity.epc ?? "")) // else if (string.IsNullOrEmpty(entity.epc ?? ""))
{ // {
return JsonManager.SimpleCustResponse($"epc is require"); // return JsonManager.SimpleCustResponse($"epc is require");
} // }
else if (string.IsNullOrEmpty(entity.startTime ?? "")) // else if (string.IsNullOrEmpty(entity.startTime ?? ""))
{ // {
return JsonManager.SimpleCustResponse($"startTime is require"); // return JsonManager.SimpleCustResponse($"startTime is require");
} // }
else if (string.IsNullOrEmpty(entity.endTime ?? "")) // else if (string.IsNullOrEmpty(entity.endTime ?? ""))
{ // {
return JsonManager.SimpleCustResponse($"endTime is require"); // return JsonManager.SimpleCustResponse($"endTime is require");
} // }
else // else
{ // {
string startTime = entity.startTime; // string startTime = entity.startTime;
//新增数据 // //新增数据
BaseCharge addObject = new BaseCharge() // BaseCharge addObject = new BaseCharge()
{ // {
Id = Guid.NewGuid(), // Id = Guid.NewGuid(),
OrgId = entity.orgId, // OrgId = entity.orgId,
EquName = entity.equName, // EquName = entity.equName,
EquCode = entity.equCode, // EquCode = entity.equCode,
Epc = entity.epc, // Epc = entity.epc,
StartTime = Convert.ToDateTime(startTime), // StartTime = Convert.ToDateTime(startTime),
EndTime = System.DateTime.Now // EndTime = System.DateTime.Now
}; // };
bool result = _unitOfWork.BaseChargeRepository.Insert(addObject); // bool result = _unitOfWork.BaseChargeRepository.Insert(addObject);
if (result) // if (result)
{ // {
return JsonManager.SimpleStatusResponse(ResultCode.OPERATE_SUCCESS); // return JsonManager.SimpleStatusResponse(ResultCode.OPERATE_SUCCESS);
} // }
else // else
{ // {
return JsonManager.SimpleStatusResponse(ResultCode.REQUEST_DATA_ERROR); // return JsonManager.SimpleStatusResponse(ResultCode.REQUEST_DATA_ERROR);
} // }
} // }
} //}
else //else
{ //{
return JsonManager.SimpleStatusResponse(ResultCode.REQUEST_DATA_ERROR); // return JsonManager.SimpleStatusResponse(ResultCode.REQUEST_DATA_ERROR);
} //}
return JsonManager.SimpleStatusResponse(ResultCode.OPERATE_SUCCESS);
} }
catch (Exception ex) catch (Exception ex)
{ {
......
JunmpPoliceStation/Controllers/BaseJpSupplierController.cs
...@@ -123,6 +123,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -123,6 +123,7 @@ namespace JunmpPoliceStation.Controllers
/// <param name="jdata"></param> /// <param name="jdata"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("GetSupplierDevelop")] [HttpPost("GetSupplierDevelop")]
[ServiceFilter(typeof(ActionLimitAttribute))]
//[NoSignAttribute] //[NoSignAttribute]
public async Task<HttpResponseMessage> GetSupplierDevelop([FromBody] JObject jdata) public async Task<HttpResponseMessage> GetSupplierDevelop([FromBody] JObject jdata)
{ {
...@@ -301,6 +302,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -301,6 +302,7 @@ namespace JunmpPoliceStation.Controllers
/// <param name="jdata"></param> /// <param name="jdata"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("AddOrUpdateSupplier")] [HttpPost("AddOrUpdateSupplier")]
[ServiceFilter(typeof(ActionLimitAttribute))]
public async Task<HttpResponseMessage> AddOrUpdateSupplier([FromBody] JObject jdata) public async Task<HttpResponseMessage> AddOrUpdateSupplier([FromBody] JObject jdata)
{ {
return await Task.Run(() => return await Task.Run(() =>
......
JunmpPoliceStation/Controllers/CabinetController.cs
...@@ -158,7 +158,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -158,7 +158,7 @@ namespace JunmpPoliceStation.Controllers
/// <param name="jdata"></param> /// <param name="jdata"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("DeleteCabinet")] [HttpPost("DeleteCabinet")]
[ServiceFilter(typeof(ActionLimitAttribute))]
public async Task<HttpResponseMessage> DeleteCabinet([FromBody] JObject jdata) public async Task<HttpResponseMessage> DeleteCabinet([FromBody] JObject jdata)
{ {
return await Task.Run(() => return await Task.Run(() =>
...@@ -1300,13 +1300,9 @@ namespace JunmpPoliceStation.Controllers ...@@ -1300,13 +1300,9 @@ namespace JunmpPoliceStation.Controllers
/// { /// {
/// "cabinetID": "0320200512000808", /// "cabinetID": "0320200512000808",
/// "cabinetChildID": "1", /// "cabinetChildID": "1",
/// "RFIDList": [{ /// "RFIDList": ["A12C621596CDF8A02B18538A",
/// "RFID": "A12C621596CDF8A02B18538A" /// "RFID": "A12C6215BCE9F863C2896E0A",
/// },{ /// "RFID": "A12C6215BCE9F863C284DF0A"]
/// "RFID": "A12C6215BCE9F863C2896E0A"
/// },{
/// "RFID": "A12C6215BCE9F863C284DF0A"
/// }]
/// } /// }
/// ///
/// ///
...@@ -1315,6 +1311,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -1315,6 +1311,7 @@ namespace JunmpPoliceStation.Controllers
/// <param name="jdata"></param> /// <param name="jdata"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("UploadRFIDDevelop")] [HttpPost("UploadRFIDDevelop")]
[ServiceFilter(typeof(ActionLimitAttribute))]
//[NoSign] //[NoSign]
public async Task<HttpResponseMessage> UploadRFIDDevelop([FromBody] JObject jdata) public async Task<HttpResponseMessage> UploadRFIDDevelop([FromBody] JObject jdata)
{ {
...@@ -1939,6 +1936,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -1939,6 +1936,7 @@ namespace JunmpPoliceStation.Controllers
/// <param name="jdata"></param> /// <param name="jdata"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("UploadRFIDListInnerDevelop")] [HttpPost("UploadRFIDListInnerDevelop")]
[ServiceFilter(typeof(ActionLimitAttribute))]
public async Task<HttpResponseMessage> UploadRFIDListInnerDevelop([FromBody] JObject jdata) public async Task<HttpResponseMessage> UploadRFIDListInnerDevelop([FromBody] JObject jdata)
{ {
return await Task.Run(() => return await Task.Run(() =>
...@@ -3240,6 +3238,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -3240,6 +3238,7 @@ namespace JunmpPoliceStation.Controllers
/// <param name="jdata"></param> /// <param name="jdata"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("AddCabinet")] [HttpPost("AddCabinet")]
[ServiceFilter(typeof(ActionLimitAttribute))]
public async Task<HttpResponseMessage> AddCabinet([FromBody] JObject jdata) public async Task<HttpResponseMessage> AddCabinet([FromBody] JObject jdata)
{ {
return await Task.Run(() => return await Task.Run(() =>
...@@ -4400,6 +4399,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -4400,6 +4399,7 @@ namespace JunmpPoliceStation.Controllers
/// <param name="jdata"></param> /// <param name="jdata"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("GetCabinetListDevelop")] [HttpPost("GetCabinetListDevelop")]
[ServiceFilter(typeof(ActionLimitAttribute))]
public async Task<HttpResponseMessage> GetCabinetListDevelop([FromBody] JObject jdata) public async Task<HttpResponseMessage> GetCabinetListDevelop([FromBody] JObject jdata)
{ {
return await Task.Run(() => return await Task.Run(() =>
......
JunmpPoliceStation/Controllers/EquipmentDetailController.cs
...@@ -267,6 +267,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -267,6 +267,7 @@ namespace JunmpPoliceStation.Controllers
/// <param name="jdata"></param> /// <param name="jdata"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("GetPageEquipmentDetailByTime")] [HttpPost("GetPageEquipmentDetailByTime")]
[ServiceFilter(typeof(ActionLimitAttribute))]
public async Task<HttpResponseMessage> GetPageEquipmentDetailByTime([FromBody] JObject jdata) public async Task<HttpResponseMessage> GetPageEquipmentDetailByTime([FromBody] JObject jdata)
{ {
return await Task.Run(() => return await Task.Run(() =>
......
JunmpPoliceStation/Controllers/EquipmentInfoController.cs
...@@ -49,6 +49,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -49,6 +49,7 @@ namespace JunmpPoliceStation.Controllers
/// <param name="jdata"></param> /// <param name="jdata"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("GetListEquipment")] [HttpPost("GetListEquipment")]
[ServiceFilter(typeof(ActionLimitAttribute))]
public async Task<HttpResponseMessage> GetListEquipment([FromBody] JObject jdata) public async Task<HttpResponseMessage> GetListEquipment([FromBody] JObject jdata)
{ {
return await Task.Run(() => return await Task.Run(() =>
......
JunmpPoliceStation/Controllers/EquipmentSizeController.cs
...@@ -200,6 +200,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -200,6 +200,7 @@ namespace JunmpPoliceStation.Controllers
/// <param name="jdata"></param> /// <param name="jdata"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("GetEquipmentSizeDevelop")] [HttpPost("GetEquipmentSizeDevelop")]
[ServiceFilter(typeof(ActionLimitAttribute))]
//[NoSignAttribute] //[NoSignAttribute]
public async Task<HttpResponseMessage> GetEquipmentSizeDevelop([FromBody] JObject jdata) public async Task<HttpResponseMessage> GetEquipmentSizeDevelop([FromBody] JObject jdata)
{ {
...@@ -377,6 +378,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -377,6 +378,7 @@ namespace JunmpPoliceStation.Controllers
/// <param name="jdata"></param> /// <param name="jdata"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("AddOrUpdateEquipmentSize")] [HttpPost("AddOrUpdateEquipmentSize")]
[ServiceFilter(typeof(ActionLimitAttribute))]
public async Task<HttpResponseMessage> AddOrUpdateEquipmentSize([FromBody] JObject jdata) public async Task<HttpResponseMessage> AddOrUpdateEquipmentSize([FromBody] JObject jdata)
{ {
return await Task.Run(() => return await Task.Run(() =>
......
JunmpPoliceStation/Controllers/InventoryController.cs
...@@ -86,7 +86,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -86,7 +86,7 @@ namespace JunmpPoliceStation.Controllers
/// <param name="jdata"></param> /// <param name="jdata"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("CreateOrder")] [HttpPost("CreateOrder")]
//[NoSign] [ServiceFilter(typeof(ActionLimitAttribute))]
public async Task<HttpResponseMessage> CreateOrder([FromBody] JObject jdata) public async Task<HttpResponseMessage> CreateOrder([FromBody] JObject jdata)
{ {
return await Task.Run(() => return await Task.Run(() =>
...@@ -3145,6 +3145,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -3145,6 +3145,7 @@ namespace JunmpPoliceStation.Controllers
/// "size":10, /// "size":10,
/// "page":0, /// "page":0,
/// "wareHouseId":"当前仓库Id", /// "wareHouseId":"当前仓库Id",
/// "orgId":"组织机构id",
/// "outInState" : 0:出库,1入库 /// "outInState" : 0:出库,1入库
/// "type":1 1采购，2借用，3领用，4调拨,5,维修,6报废,7跨库借用，9跨库归还 10跨库归还入库 12销毁 /// "type":1 1采购，2借用，3领用，4调拨,5,维修,6报废,7跨库借用，9跨库归还 10跨库归还入库 12销毁
/// "currentState":""0 已完成，1未完成 /// "currentState":""0 已完成，1未完成
...@@ -3177,6 +3178,15 @@ namespace JunmpPoliceStation.Controllers ...@@ -3177,6 +3178,15 @@ namespace JunmpPoliceStation.Controllers
string currentState = entity.currentState; string currentState = entity.currentState;
//var warehouse = _unitOfWork.WarehouseRepository.Get(p => p.Id.Equals(warehouseID)).Orgization;//当前仓库信息 //var warehouse = _unitOfWork.WarehouseRepository.Get(p => p.Id.Equals(warehouseID)).Orgization;//当前仓库信息
Expression<Func<ViewOutInOrder, bool>> expression = t => t.Id != null;//0,调拨出库 1采购，2借用，3领用，4调拨入库,5,维修,12报废 Expression<Func<ViewOutInOrder, bool>> expression = t => t.Id != null;//0,调拨出库 1采购，2借用，3领用，4调拨入库,5,维修,12报废
if (!string.IsNullOrEmpty(entity.orgId))
{
string orgId = entity.orgId;
var warehouseList = _unitOfWork.WarehouseRepository
.GetList(x => x.OrgizationId == orgId)
.Select(x => x.Id)
.ToList();
expression = LambdaExtensions.AndAlso(expression, t => warehouseList.Contains(t.WarehouseId));
}
if (!String.IsNullOrEmpty(entity.wareHouseId)) if (!String.IsNullOrEmpty(entity.wareHouseId))
{ {
warehouseID = entity.wareHouseId; warehouseID = entity.wareHouseId;
...@@ -3247,38 +3257,35 @@ namespace JunmpPoliceStation.Controllers ...@@ -3247,38 +3257,35 @@ namespace JunmpPoliceStation.Controllers
} }
} }
if (string.IsNullOrEmpty(warehouseID))
{ var outInOrders = _unitOfWork.ViewOutInOrderRepository.GetList(expression).ToList().GroupBy(t => t.Id);
var content = new var res = outInOrders
{ .Select(t => new
totalElements = 0, {
content = new List<string> { }, t.FirstOrDefault().Id,
}; t.FirstOrDefault().Order,
return JsonManager.ReturnSuccessResponse(content); t.FirstOrDefault().Type,
} t.FirstOrDefault().WarehouseId,
else WarehouseName = t.Count() > 1 ? t.FirstOrDefault().WarehouseName + "等" : t.FirstOrDefault().WarehouseName,
WarehouseNameDetail = t.Select(y => y.WarehouseName),
t.FirstOrDefault().CurrentState,
t.FirstOrDefault().CreateTime,
t.FirstOrDefault().PrintOrderCode,
PrintOrderTime = t.FirstOrDefault().PrintOrderTime?.ToString("yyyy年MM月dd日"),
StateType = (t.FirstOrDefault().CurrentState.Equals(2) || t.FirstOrDefault().CurrentState.Equals(11) || t.FirstOrDefault().CurrentState.Equals(3) || (t.FirstOrDefault().CurrentState.Equals(1) && (t.FirstOrDefault().Type.Equals(1) || t.FirstOrDefault().Type.Equals(3) || t.FirstOrDefault().Type.Equals(6) || t.FirstOrDefault().Type.Equals(12)))) ? "0" :
t.FirstOrDefault().CurrentState.Equals(0) || (t.FirstOrDefault().CurrentState == null && t.FirstOrDefault().Type.Equals(1)) || (t.FirstOrDefault().CurrentState.Equals(1) && (t.FirstOrDefault().Type.Equals(0) || t.FirstOrDefault().Type.Equals(2) || t.FirstOrDefault().Type.Equals(11) || t.FirstOrDefault().Type.Equals(4) || t.FirstOrDefault().Type.Equals(5) || t.FirstOrDefault().Type.Equals(7) || t.FirstOrDefault().Type.Equals(8) || t.FirstOrDefault().Type.Equals(9) || t.FirstOrDefault().Type.Equals(10)))
? "1" : null
})
.OrderByDescending(t => t.CreateTime)
.ToList();
//var orderList= outInOrders.totalElements
var content = new
{ {
var outInOrders = _unitOfWork.ViewOutInOrderRepository.GetPage(expression, "-CreateTime", page, size, false); totalElements = outInOrders.Count(),
//var orderList= outInOrders.totalElements content = res.Skip(page * size).Take(size).ToList()
var content = new };
{ return JsonManager.ReturnSuccessResponse(content);
outInOrders?.totalElements,
content = outInOrders.content.Select(t => new
{
t.Id,
t.Order,
t.Type,
t.WarehouseId,
t.WarehouseName,
t.CurrentState,
t.CreateTime,
StateType = (t.CurrentState.Equals(2) || t.CurrentState.Equals(11) || t.CurrentState.Equals(3) || (t.CurrentState.Equals(1) && (t.Type.Equals(1) || t.Type.Equals(3) || t.Type.Equals(6) || t.Type.Equals(12)))) ? "0" :
t.CurrentState.Equals(0) || (t.CurrentState == null && t.Type.Equals(1)) || (t.CurrentState.Equals(1) && (t.Type.Equals(0) || t.Type.Equals(2) || t.Type.Equals(11) || t.Type.Equals(4) || t.Type.Equals(5) || t.Type.Equals(7) || t.Type.Equals(8) || t.Type.Equals(9) || t.Type.Equals(10)))
? "1" : null
})
};
return JsonManager.ReturnSuccessResponse(content);
}
} }
else else
{ {
...@@ -6011,6 +6018,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -6011,6 +6018,7 @@ namespace JunmpPoliceStation.Controllers
/// <param name="jdata"></param> /// <param name="jdata"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("UploadRFIDDevelop")] [HttpPost("UploadRFIDDevelop")]
[ServiceFilter(typeof(ActionLimitAttribute))]
//[NoSign] //[NoSign]
public async Task<HttpResponseMessage> UploadRFIDDevelop([FromBody] JObject jdata) public async Task<HttpResponseMessage> UploadRFIDDevelop([FromBody] JObject jdata)
{ {
...@@ -9183,7 +9191,6 @@ namespace JunmpPoliceStation.Controllers ...@@ -9183,7 +9191,6 @@ namespace JunmpPoliceStation.Controllers
"EquipmentSizecodeNavigation.Detail" , "EquipmentSizecodeNavigation.Detail" ,
"EquipmentCodeNavigation" , "EquipmentCodeNavigation" ,
"WarehouseCodeNavigation" , "WarehouseCodeNavigation" ,
"WarehouseCodeNavigation.Orgization",
"CommonJpEquipmentStates", "CommonJpEquipmentStates",
"SupplierCodeNavigation", "SupplierCodeNavigation",
"Cabinet", "Cabinet",
...@@ -9337,10 +9344,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -9337,10 +9344,7 @@ namespace JunmpPoliceStation.Controllers
} }
var EquipmentList = _unitOfWork.EquipmentInventoryRepository.GetList(expression, c => c.CreateTime, false, param) var EquipmentList = _unitOfWork.EquipmentInventoryRepository.GetList(expression, c => c.CreateTime, false, param)
.OrderBy(x => x.EquipmentCode) .OrderBy(x=>x.EquipmentCodeNavigation.Code)
.ThenBy(x => x.EquipmentSizecode)
.ThenBy(x => x.WarehouseCodeNavigation.Orgization.Code)
.ThenBy(x => x.WarehouseCode)
.ToList(); .ToList();
var datas = EquipmentList.Select(equipment => new var datas = EquipmentList.Select(equipment => new
......
JunmpPoliceStation/Controllers/OrganizationController.cs
...@@ -507,6 +507,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -507,6 +507,7 @@ namespace JunmpPoliceStation.Controllers
/// <param name="jdata"></param> /// <param name="jdata"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("GetListOrg")] [HttpPost("GetListOrg")]
[ServiceFilter(typeof(ActionLimitAttribute))]
public async Task<HttpResponseMessage> GetListOrg([FromBody] JObject jdata) public async Task<HttpResponseMessage> GetListOrg([FromBody] JObject jdata)
{ {
return await Task.Run(() => return await Task.Run(() =>
...@@ -1246,7 +1247,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -1246,7 +1247,7 @@ namespace JunmpPoliceStation.Controllers
/// { /// {
/// "orgId":"id", /// "orgId":"id",
/// "orderCode":"单号", /// "orderCode":"单号",
/// "orderType":"单据类型 借:借用 领:领用 支:调拨 价:调拨 废:报废 销：销毁" /// "orderType":"单据类型 借:借用 领:领用 支:调拨 价:调拨 废:报废 销：销毁 入：采购"
/// ///
/// } /// }
/// ///
...@@ -1378,6 +1379,27 @@ namespace JunmpPoliceStation.Controllers ...@@ -1378,6 +1379,27 @@ namespace JunmpPoliceStation.Controllers
printOrderTime = order.PrintOrderTime?.ToString("yyyy年MM月dd日"), printOrderTime = order.PrintOrderTime?.ToString("yyyy年MM月dd日"),
}); });
} }
case "入":
{
order = _unitOfWork.PurchaseOrderyRepository.Get(x => x.OrderCode == orderCode);
if (order == null)
{
return JsonManager.SimpleStatusResponse(ResultCode.REQUEST_DATA_ERROR);
}
if (string.IsNullOrEmpty(order.PrintOrderCode))
{
CreateNewOrderCount(ref order, org, orderType, out string printOrderCode);
order.PrintOrderCode = printOrderCode;
order.PrintOrderTime = DateTime.Now;
_unitOfWork.PurchaseOrderyRepository.Update(order);
}
return JsonManager.ReturnSuccessResponse(new
{
printOrderCode = order.PrintOrderCode,
printOrderTime = order.PrintOrderTime?.ToString("yyyy年MM月dd日"),
});
}
default: default:
{ {
return JsonManager.SimpleStatusResponse(ResultCode.REQUEST_DATA_ERROR); return JsonManager.SimpleStatusResponse(ResultCode.REQUEST_DATA_ERROR);
......
JunmpPoliceStation/Controllers/PolicemanController.cs
...@@ -54,6 +54,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -54,6 +54,7 @@ namespace JunmpPoliceStation.Controllers
/// <param name="jdata"></param> /// <param name="jdata"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("GetPolicemanDevelop")] [HttpPost("GetPolicemanDevelop")]
[ServiceFilter(typeof(ActionLimitAttribute))]
//[NoSign] //[NoSign]
public async Task<HttpResponseMessage> GetPolicemanDevelop([FromBody] JObject jdata) public async Task<HttpResponseMessage> GetPolicemanDevelop([FromBody] JObject jdata)
{ {
...@@ -557,6 +558,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -557,6 +558,7 @@ namespace JunmpPoliceStation.Controllers
/// <param name="jdata"></param> /// <param name="jdata"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("AddOrUpdatePoliceman")] [HttpPost("AddOrUpdatePoliceman")]
[ServiceFilter(typeof(ActionLimitAttribute))]
//[NoSign] //[NoSign]
public async Task<HttpResponseMessage> AddOrUpdatePoliceman([FromBody] JObject jdata) public async Task<HttpResponseMessage> AddOrUpdatePoliceman([FromBody] JObject jdata)
{ {
......
JunmpPoliceStation/Controllers/PrintController.cs
...@@ -248,6 +248,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -248,6 +248,7 @@ namespace JunmpPoliceStation.Controllers
/// <param name="jdata"></param> /// <param name="jdata"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("GetPrintList")] [HttpPost("GetPrintList")]
[ServiceFilter(typeof(ActionLimitAttribute))]
public async Task<HttpResponseMessage> GetPrintList([FromBody] JObject jdata) public async Task<HttpResponseMessage> GetPrintList([FromBody] JObject jdata)
{ {
return await Task.Run(() => return await Task.Run(() =>
...@@ -644,6 +645,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -644,6 +645,7 @@ namespace JunmpPoliceStation.Controllers
/// } /// }
/// </remarks> /// </remarks>
[HttpPost("UpdateEpcState")] [HttpPost("UpdateEpcState")]
[ServiceFilter(typeof(ActionLimitAttribute))]
//[NoSign] //[NoSign]
public async Task<HttpResponseMessage> UpdateEpcState([FromBody] JObject jdata) public async Task<HttpResponseMessage> UpdateEpcState([FromBody] JObject jdata)
{ {
...@@ -1016,6 +1018,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -1016,6 +1018,7 @@ namespace JunmpPoliceStation.Controllers
/// <returns></returns> /// <returns></returns>
[HttpPost("GenerateExtTagEpc")] [HttpPost("GenerateExtTagEpc")]
[ServiceFilter(typeof(ActionLimitAttribute))]
public async Task<HttpResponseMessage> GenerateExtTagEpc([FromBody] JObject jdata) public async Task<HttpResponseMessage> GenerateExtTagEpc([FromBody] JObject jdata)
{ {
return await Task.Run(() => return await Task.Run(() =>
...@@ -1196,6 +1199,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -1196,6 +1199,7 @@ namespace JunmpPoliceStation.Controllers
/// <param name="jdata"></param> /// <param name="jdata"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("GenerateIntTagEpc")] [HttpPost("GenerateIntTagEpc")]
[ServiceFilter(typeof(ActionLimitAttribute))]
public async Task<HttpResponseMessage> GenerateIntTagEpc([FromBody] JObject jdata) public async Task<HttpResponseMessage> GenerateIntTagEpc([FromBody] JObject jdata)
{ {
return await Task.Run(() => return await Task.Run(() =>
...@@ -1329,6 +1333,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -1329,6 +1333,7 @@ namespace JunmpPoliceStation.Controllers
/// <param name="jdata"></param> /// <param name="jdata"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("GenerateInventory")] [HttpPost("GenerateInventory")]
[ServiceFilter(typeof(ActionLimitAttribute))]
public async Task<HttpResponseMessage> GenerateInventory([FromBody] JObject jdata) public async Task<HttpResponseMessage> GenerateInventory([FromBody] JObject jdata)
{ {
return await Task.Run(() => return await Task.Run(() =>
...@@ -1703,6 +1708,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -1703,6 +1708,7 @@ namespace JunmpPoliceStation.Controllers
/// } /// }
/// </remarks> /// </remarks>
[HttpPost("GenerateRangeInventoryDevelop")] [HttpPost("GenerateRangeInventoryDevelop")]
[ServiceFilter(typeof(ActionLimitAttribute))]
public async Task<HttpResponseMessage> GenerateRangeInventoryDevelop([FromBody] JObject jdata) public async Task<HttpResponseMessage> GenerateRangeInventoryDevelop([FromBody] JObject jdata)
{ {
return await Task.Run(() => return await Task.Run(() =>
......
JunmpPoliceStation/Controllers/WarehouseController.cs
...@@ -373,6 +373,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -373,6 +373,7 @@ namespace JunmpPoliceStation.Controllers
/// <param name="jdata"></param> /// <param name="jdata"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("GetListOrgWarehouse")] [HttpPost("GetListOrgWarehouse")]
[ServiceFilter(typeof(ActionLimitAttribute))]
//[NoSign] //[NoSign]
public async Task<HttpResponseMessage> GetListOrgWarehouse([FromBody] JObject jdata) public async Task<HttpResponseMessage> GetListOrgWarehouse([FromBody] JObject jdata)
{ {
...@@ -695,6 +696,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -695,6 +696,7 @@ namespace JunmpPoliceStation.Controllers
/// <param name="jdata"></param> /// <param name="jdata"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("GetWarehouseDevelop")] [HttpPost("GetWarehouseDevelop")]
[ServiceFilter(typeof(ActionLimitAttribute))]
//[NoSign] //[NoSign]
public async Task<HttpResponseMessage> GetWarehouseDevelop([FromBody] JObject jdata) public async Task<HttpResponseMessage> GetWarehouseDevelop([FromBody] JObject jdata)
{ {
...@@ -809,6 +811,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -809,6 +811,7 @@ namespace JunmpPoliceStation.Controllers
/// <param name="jdata"></param> /// <param name="jdata"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("AddOrUpdateWarehouse")] [HttpPost("AddOrUpdateWarehouse")]
[ServiceFilter(typeof(ActionLimitAttribute))]
//[NoSign] //[NoSign]
public async Task<HttpResponseMessage> AddOrUpdateWarehouse([FromBody] JObject jdata) public async Task<HttpResponseMessage> AddOrUpdateWarehouse([FromBody] JObject jdata)
{ {
...@@ -1203,7 +1206,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -1203,7 +1206,7 @@ namespace JunmpPoliceStation.Controllers
/// <param name="jdata"></param> /// <param name="jdata"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("GetWarehouseEquipmentDevelop")] [HttpPost("GetWarehouseEquipmentDevelop")]
[ServiceFilter(typeof(ActionLimitAttribute))]
public async Task<HttpResponseMessage> GetWarehouseEquipmentDevelop([FromBody] JObject jdata) public async Task<HttpResponseMessage> GetWarehouseEquipmentDevelop([FromBody] JObject jdata)
{ {
return await Task.Run(() => return await Task.Run(() =>
......
JunmpPoliceStation/Controllers/WarehouseDevController.cs
...@@ -581,7 +581,7 @@ namespace JunmpPoliceStation.Controllers ...@@ -581,7 +581,7 @@ namespace JunmpPoliceStation.Controllers
/// <param name="jdata"></param> /// <param name="jdata"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("UpDevDevelop")] [HttpPost("UpDevDevelop")]
[ServiceFilter(typeof(ActionLimitAttribute))]
public async Task<HttpResponseMessage> UpDevDevelop([FromBody] JObject jdata) public async Task<HttpResponseMessage> UpDevDevelop([FromBody] JObject jdata)
{ {
return await Task.Run(() => return await Task.Run(() =>
......
JunmpPoliceStation/Properties/launchSettings.json
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development" "ASPNETCORE_ENVIRONMENT": "Development"
}, },
"applicationUrl": "http://192.168.3.1:5000;http://192.168.10.88:5000;http://localhost:5001;http://localhost:5000;http://0.0.0.0:5001;" "applicationUrl": "http://localhost:5000;http://192.168.10.88:5000;http://192.168.3.1:5001;http://localhost:5000;http://0.0.0.0:5001;"
}, },
"Docker": { "Docker": {
"commandName": "Docker", "commandName": "Docker",
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论