qinqi 7 месяцев назад
Родитель
Сommit
751ec2cd2c

+ 9 - 0
wwwroot/mes/mst/packingform/packingform.ashx

@@ -433,6 +433,11 @@ public class packingform : IHttpHandler, IReadOnlySessionState
     {
         using (IDataAccess conn = DataAccess.Create())
         {
+            if (string.IsNullOrWhiteSpace(form["PLATETYPE"].ToString()) || string.IsNullOrWhiteSpace(form["STACKNUM"].ToString()))
+            {
+                return new JsonResult(JsonStatus.error) { message = "托盘类型和码垛数量为必选项,不允许保存" }.ToJson();
+            }
+
             //校验如果商标变更,判断生产计划是否允许变更该商标,及用户是否有高级权限,是否有对应计划  add by qq 20240422
             string planFlag = conn.ExecuteScalar(@"
                 SELECT PLANFLAG FROM TP_MST_User WHERE USERID = @USERID@
@@ -1222,6 +1227,10 @@ public class packingform : IHttpHandler, IReadOnlySessionState
         {
             try
             {
+                if (string.IsNullOrWhiteSpace(platetype) || string.IsNullOrWhiteSpace(stacknum))
+                {
+                    return new JsonResult(JsonStatus.error) { message = "托盘类型和码垛数量为必选项,不允许保存" }.ToJson();
+                }
                 //conn.BeginTransaction();
                 //明细 
                 DataTable jsonTable = JsonConvert.DeserializeObject<DataTable>(jsondata);

+ 1 - 1
wwwroot/mes/mst/packingform/packingform_index.html

@@ -64,7 +64,7 @@
         <thead>
             <tr>
                 <th data-options="field:'SID',title:'SID',width:220,align:'left',checkbox:true,hidden:true">SID</th>
-                <!--<th data-options="field:'PACKINGFORMID',title:'包装单ID',align:'left',sortable:true"></th>-->
+                <th data-options="field:'PACKINGFORMID',title:'包装单ID',align:'left',sortable:true"></th>
                 <!--<th data-options="field:'PACKINGBOMID',title:'包装配置ID',align:'left',sortable:true"></th>-->
                 <th data-options="field:'PACKINGLINE',title:'包装线',align:'left',sortable:true,styler:rowStyle"></th>
                 <th data-options="field:'ORDERNO',title:'执行顺序',align:'left',sortable:true,styler:rowStyle"></th>