From 5ce969ed34e91c931cce38e2feb5d2c208633a96 Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期日, 03 十一月 2024 18:34:53 +0800
Subject: [PATCH] 修改问题
---
Wms/WMS.IBLL/IBllQualityServer/IQualityInspectServer.cs | 9 +-
HTML/views/QualityControl/QualityInformationFrom.html | 4
Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs | 34 ++++++++---
Wms/Wms/Controllers/BllQualityController.cs | 8 +-
HTML/views/QualityControl/QualityInformation.html | 112 ++++++++++++++++++++++++++++++++++++-
Wms/WMS.Entity/BllQualityEntity/BllQualityInspect.cs | 2
6 files changed, 146 insertions(+), 23 deletions(-)
diff --git a/HTML/views/QualityControl/QualityInformation.html b/HTML/views/QualityControl/QualityInformation.html
index 23675f2..dbb65f2 100644
--- a/HTML/views/QualityControl/QualityInformation.html
+++ b/HTML/views/QualityControl/QualityInformation.html
@@ -73,6 +73,22 @@
<i class="layui-icon layui-icon-add layuiadmin-button-btn"></i>娣诲姞
</button>
</div>
+ <div class="layui-inline" id="divFinish" style="display: none; padding-top: 10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">璐﹀彿</label>
+ <div class="layui-input-inline" style="width: 220px;">
+ <input type="text" id="admin" name="admin" placeholder="璐﹀彿" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline DivLoadingArea" style="margin-top: 10px;">
+ <label class="layui-form-label">瀵嗙爜</label>
+ <div class="layui-input-inline" style="width: 220px;">
+ <input type="text" id="password" name="password" placeholder="瀵嗙爜" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+ </div>
</div>
</div>
<div id="center"></div>
@@ -163,9 +179,7 @@
{
field: 'InspectNo',title: '妫�楠屽彿',align: 'center'
},
- {
- field: 'Status',title: '鐘舵��',align: 'center',templet: '#IsStatus',
- },
+
{
field: 'SkuNo',title: '鐗╂枡缂栫爜',align: 'center'
},
@@ -445,6 +459,98 @@
});
})
+
+ table.on('tool(LAY-app-content-list)', function (obj) {
+ var data = obj.data;
+ switch(obj.event)
+ {
+ case "edit" :
+ layer.open({
+ type: 1,
+ title: '澶嶆牳纭',
+ content: $('#divFinish'),
+ maxmin: true,
+ area: ['350px','215px'],
+ btn: ['纭畾', '鍙栨秷'],
+ yes: function(index, layero) {
+ var pa = $('#PickingArea').val();
+ console.log(pa)
+ if (doing== true) {
+ doing= false;
+
+ if($('#admin').val()==''){
+ layer.msg("璇疯緭鍏ヨ处鍙�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ doing= true;
+ return;
+ }
+ if($("#password").val() == '')
+ {
+ layer.msg("璇疯緭鍏ュ瘑鐮�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ doing= true;
+ return;
+ }
+
+ var param = {
+ Id:data.Id,
+ UserNo:$('#admin').val(),
+ Password:$('#password').val(),
+ };
+ console.log(param);
+ sendData(IP + "/BllQuality/InsertFuHe", param, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ refreshTable
+ (
+ // $("#ASNNo").val(),
+ $("#LotNo").val(),
+ $("#SkuNo").val(),
+ $("#SkuName").val(),
+ $("#InsertQuality").val(),
+ );
+ $('#admin').val("");
+ $('#password').val("");
+ doing = true
+ });
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ doing = true ;
+ $('#admin').val("");
+ $('#password').val("")
+ });
+ }
+ layer.close(index);
+ });
+
+
+ }else{
+ layer.msg("璇峰嬁閲嶅鐐瑰嚮", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ }
+
+ }
+ });
+
+ break;
+
+ default:break;
+ }
+ });
+
+
var element = layui.element;
var houseId = 0;
var param = {
diff --git a/HTML/views/QualityControl/QualityInformationFrom.html b/HTML/views/QualityControl/QualityInformationFrom.html
index 98add69..fa112e6 100644
--- a/HTML/views/QualityControl/QualityInformationFrom.html
+++ b/HTML/views/QualityControl/QualityInformationFrom.html
@@ -34,7 +34,7 @@
<input type="text" name="SkuNo" placeholder="璇疯緭鍏ョ墿鏂欏彿" lay-verify="required" autocomplete="off" class="layui-input">
</div>
</div>
- <!-- <div class="layui-form-item">
+ <div class="layui-form-item">
<label class="layui-form-label">瀹℃牳鐘舵��</label>
<div class="layui-input-block" style="width: 70%;">
<select name="IsQualified" id="IsQualified" lay-verify="">
@@ -43,7 +43,7 @@
<option value="1" selected>鍚堟牸</option>
</select>
</div>
- </div> -->
+ </div>
<div class="layui-form-item layui-hide">
<input type="button" lay-submit lay-filter="layuiadmin-app-form-submit" id="layuiadmin-app-form-submit" value="纭娣诲姞">
</div>
diff --git a/Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs b/Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs
index 8c3ef1b..386cd35 100644
--- a/Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs
+++ b/Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs
@@ -6,6 +6,7 @@
using Model.ModelDto.BllQualityDto;
using Model.ModelVm;
using SqlSugar;
+using Utility.Tools;
using WMS.DAL;
using WMS.Entity.BllAsnEntity;
using WMS.Entity.BllQualityEntity;
@@ -193,23 +194,37 @@
return isquality;
}
-
/// <summary>
/// 璐ㄦ澶嶆牳淇℃伅
/// </summary>
- /// <param name="model">璐ㄦ淇℃伅瀹炰綋妯″瀷</param>
+ /// <param name="id"></param>
+ /// <param name="userNo"></param>
+ /// <param name="password"></param>
+ /// <param name="userId"></param>
/// <returns></returns>
- public int FinshQuality(int id,string type,int userId)
+ /// <exception cref="Exception"></exception>
+ public int FinshQuality(int id,string userNo, string password, int userId)
{
- //楠岃瘉璐ㄦ鍙锋槸鍚︿负绌�
- if (string.IsNullOrEmpty(type))
+ var loginPwd = Md5Tools.CalcMd5(password);
+ var date = Db.Queryable<SysUserInfor>().First(m => m.IsDel == "0" && m.UserName == userNo && m.PassWord == loginPwd);
+
+ if (date == null) //璐﹀彿瀵嗙爜鏄惁姝ｇ‘
{
- throw new Exception("鐘舵�佷笉鑳戒负绌猴紒");
+ throw new Exception("璐﹀彿瀵嗙爜涓嶆纭垨娌℃湁姝よ处鍙�");
}
+ if (date.Status != "0") //褰撳墠璐﹀彿鏄惁姝ｅ父鍚敤
+ {
+ throw new Exception("褰撳墠璐﹀彿闈炲惎鐢ㄧ姸鎬�");
+ }
+
var model = Db.Queryable<BllQualityInspect>().First(m=>m.IsDel == "0" && m.Id == id);
if (model == null)
{
throw new Exception("鏈煡璇㈠埌璐ㄦ淇℃伅");
+ }
+ if (date.Id == model.CreateUser)
+ {
+ throw new Exception("澶嶆牳澶辫触锛屽鏍镐汉鍛樺拰鍏抽棴璁㈠崟浜哄憳涓嶈兘鐩稿悓锛�");
}
int isTui = 0;
//楠岃瘉鍏ュ簱鍗曞彿鏄惁涓虹┖
@@ -233,8 +248,9 @@
- model.Status = type; //瑙勬牸
- model.IsQualified = type;
+ model.Status = "1"; //瑙勬牸
+ model.UpdateTime = DateTime.Now;
+ model.UpdateUser = userId;
//model.SupplierLot = arrivalDetail.SupplierLot; //渚涜揣鎵规
//鏌ユ壘搴撳瓨鏄庣粏淇℃伅
@@ -247,7 +263,7 @@
{
List<DataBoxInfo> box = Db.Queryable<DataBoxInfo>().Where(a => a.IsDel == "0" && a.StockDetailId == item.Id && a.SkuNo == model.SkuNo && a.LotNo == model.LotNo).ToList();
//鍒ゆ柇鍚堟牸鐘舵�佹槸鍚﹀悎鏍�
- if (type == "1")
+ if (model.IsQualified == "1")
{
//鍚堟牸 鐩稿悓鎵规搴撳瓨淇℃伅鍏ㄩ儴鏀逛负鍚堟牸鐘舵�� 涓斿悎鏍兼暟閲忓鍔犱负鍚屾壒娆″悓鍗曞彿璇ョ墿鏂欏叏閮ㄦ暟閲忎箣鍜�
model.PassQty += item.Qty;
diff --git a/Wms/WMS.Entity/BllQualityEntity/BllQualityInspect.cs b/Wms/WMS.Entity/BllQualityEntity/BllQualityInspect.cs
index e8cc2fe..1845f40 100644
--- a/Wms/WMS.Entity/BllQualityEntity/BllQualityInspect.cs
+++ b/Wms/WMS.Entity/BllQualityEntity/BllQualityInspect.cs
@@ -26,7 +26,7 @@
public string ASNNo {get;set;}
/// <summary>
- /// Desc:鐘舵�� 0 绛夊緟瀹℃牳 1 瀹℃牳閫氳繃 2瀹℃牳涓嶉�氳繃
+ /// Desc:鐘舵�� 0 绛夊緟澶嶆牳 1 澶嶆牳瀹屾垚
/// Default:
/// Nullable:True
/// </summary>
diff --git a/Wms/WMS.IBLL/IBllQualityServer/IQualityInspectServer.cs b/Wms/WMS.IBLL/IBllQualityServer/IQualityInspectServer.cs
index ee1a4e7..a19aaea 100644
--- a/Wms/WMS.IBLL/IBllQualityServer/IQualityInspectServer.cs
+++ b/Wms/WMS.IBLL/IBllQualityServer/IQualityInspectServer.cs
@@ -28,11 +28,12 @@
/// <summary>
/// 澶嶆牳璐ㄦ缁撴灉
/// </summary>
- /// <param name="id">ID</param>
- /// <param name="type">绫诲瀷 1 閫氳繃 2 涓嶉�氳繃</param>
- /// <param name="userId">鎿嶄綔浜�</param>
+ /// <param name="id"></param>
+ /// <param name="userNo"></param>
+ /// <param name="password"></param>
+ /// <param name="userId"></param>
/// <returns></returns>
- int FinshQuality(int id, string type, int userId);
+ int FinshQuality(int id, string userNo, string password, int userId);
#endregion
}
}
diff --git a/Wms/Wms/Controllers/BllQualityController.cs b/Wms/Wms/Controllers/BllQualityController.cs
index 6176bb4..757407f 100644
--- a/Wms/Wms/Controllers/BllQualityController.cs
+++ b/Wms/Wms/Controllers/BllQualityController.cs
@@ -5,6 +5,7 @@
using System;
using WMS.Entity.BllQualityEntity;
using WMS.IBLL.IBllQualityServer;
+using Model.ModelVm;
namespace Wms.Controllers
{
@@ -73,7 +74,7 @@
model.CreateUser = int.Parse(userId);
_qualityServer.InsertQuality(model);
- return Ok(new { code = 0, count = 0, msg = "鐗╂枡璐ㄦ淇℃伅鎿嶄綔鎴愬姛", data = "" });
+ return Ok(new { code = 0, count = 0, msg = "鐗╂枡璐ㄦ淇℃伅娣诲姞鎴愬姛", data = "" });
}
catch (Exception e)
{
@@ -89,7 +90,7 @@
/// <param name="model">璐ㄦ淇℃伅瀹炰綋妯″瀷</param>
/// <returns></returns>
[HttpPost]
- public IActionResult InsertFuHe(BllQualityInspect model)
+ public IActionResult InsertFuHe(FinshVm model)
{
try
{
@@ -104,8 +105,7 @@
{
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- model.CreateUser = int.Parse(userId);
- _qualityServer.InsertQuality(model);
+ _qualityServer.FinshQuality(model.Id,model.UserNo,model.Password, int.Parse(userId));
return Ok(new { code = 0, count = 0, msg = "鐗╂枡璐ㄦ淇℃伅鎿嶄綔鎴愬姛", data = "" });
}
--
Gitblit v1.8.0