From 852cd93a3e65988a2354a0b96b79d5e2d05bf646 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 14 四月 2023 09:23:25 +0800
Subject: [PATCH] 工序流转卡 工艺参数 应该 可编辑； 1.生产资源 有异常； 删除有问题，删除后出来 异常数据( )； 其他信息 里的 几个字段 输入 字符时 报错，应提示； 2.工序 ： 9999的 转工序 ， 有个 转工序 字段，是否没显示出来； 其他信息 里的 几个字段 输入 字符时 报错，应提示； 3.工作中心： 其他信息 里的 几个字段 输入 字符时 报错，应提示； 4.生产班组： 刷新出来 异常数据； 其他信息 里的 几个字段 输入 字符时 报错，应提示； 5.基础资料的 一些 复选框 标题不对； 6. ADMIN 的账号 工艺路线 的模块 无法进行 新增 编辑； 7.工艺路线查询；工序号，工序代码，工序，工艺参数，表体备注， 其他的放后面 子表 的 委外标记 放到最后面去； 并且 把 供应商代码和供应商 放出来（也放在最后几个）； 8.部门有 很多异常数据； 选择的时候 出来了； 9.流转卡维护， 表头 很多没有用的列，单据号 日期 都没有显示； 转工序 是否要打印（跟客户确认）； 10. 流转卡拆分时，一些 列的 排序；
---
WebAPI/Controllers/SCGL/Sc_CallGoodsBackRequestBillController.cs | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 171 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_CallGoodsBackRequestBillController.cs b/WebAPI/Controllers/SCGL/Sc_CallGoodsBackRequestBillController.cs
index de77dbd..8281cd6 100644
--- a/WebAPI/Controllers/SCGL/Sc_CallGoodsBackRequestBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_CallGoodsBackRequestBillController.cs
@@ -5,6 +5,8 @@
using Newtonsoft.Json;
using DBUtility;
using System;
+using Newtonsoft.Json.Linq;
+using System.Collections.Generic;
namespace WebAPI.Controllers.SCGL
{
@@ -28,6 +30,7 @@
public DateTime HEndDate { get; set; }//缁撴潫鏃堕棿
public string ProcMul { get; set; }//宸ユ
public string Hmaker { get; set; }//褰撳墠鐧诲綍浜�
+ public string Arbitrarily { get; set; }//浠绘剰鍙傛暟
}
[Route("Sc_CallGoodsBackRequestBill/JIT_CallGoodsBackRequestBillList")]
@@ -37,7 +40,7 @@
try
{
//鏌ョ湅鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("JIT_ComplementGoods", 1, false, user))
+ if (!DBUtility.ClsPub.Security_Log("JIT_ComplementGoods_Query", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -57,7 +60,7 @@
CallGoodsBackRequest com = JsonConvert.DeserializeObject<CallGoodsBackRequest>(sWhere.ToString());
ds = oCN.RunProcReturn($"exec h_p_JIT_BackGoodsRequestBillList_Query '{com.HBeginDate}','{com.HEndDate.AddDays(1).AddSeconds(-1)}','{com.HBillNo}','{com.MaterialNumber}'," +
- $"'{com.MaterialName}','{com.MaterialModel}','{com.HDeptName}','{com.ProcMul}','{com.Hmaker}','{com.HOrgID}'", "h_p_JIT_BackGoodsRequestBillList_Query");
+ $"'{com.MaterialName}','{com.MaterialModel}','{com.HDeptName}','{com.ProcMul}','{com.Hmaker}','{com.HOrgID}'", "h_p_JIT_BackGoodsRequestBillList_Query");
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -76,7 +79,7 @@
}
#endregion
- #region 閫�鏂欑敵璇峰崟 鍒犻櫎
+ #region 閫�鏂欑敵璇峰崟 鍒犻櫎
[Route("Sc_CallGoodsBackRequestBill/DelCallGoodsBackRequestBill")]
[HttpGet]
public object DelCallGoodsBackRequestBill(string HInterID, string HEntryID, string user)
@@ -111,5 +114,170 @@
}
}
#endregion
+
+ #region 閫�鏂欑敵璇峰崟 閫�鏂欑‘璁ら〉闈㈠垪琛�
+ [Route("Sc_CallGoodsBackRequestBill/JIT_BackGoodsList")]
+ [HttpGet]
+ public object JIT_BackGoodsList(string HInterID, string user)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn($"exec h_p_JIT_BackGoods_Load '{HInterID}'", "h_p_JIT_BackGoods_Load");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 閫�鏂欑‘璁� 鍝佽川纭
+ //浼犻�掑弬鏁�
+ public class JIT_BackGoods_PZQR {
+ public int? hmainid = 0;
+ public int? Hsubid = 0;
+ public int? HSupID = 0;
+ public int? HWHID = 0;
+ public string 閫�鏂欏師鍥� { get; set; }
+ public int? 閫�鍥炴暟閲� = 0;
+ public int? HSPID = 0;
+ }
+
+ [Route("Sc_CallGoodsBackRequestBill/JIT_BackGoodsList_PZQR")]
+ [HttpPost]
+ public object JIT_BackGoodsList_PZQR([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string[] sArray = _value.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ try
+ {
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", "");
+
+ List<JIT_BackGoods_PZQR> listCa = new List<JIT_BackGoods_PZQR>();
+ //鑾峰彇琛ㄦ牸鏁版嵁闆嗗悎
+ listCa = JsonConvert.DeserializeObject<List<JIT_BackGoods_PZQR>>(msg2.ToString());
+
+ int a = 0;
+ for (int i = 0; i < listCa.Count; i++)
+ {
+ ds = oCN.RunProcReturn($"exec h_p_JIT_BackGoods_QACheck '{listCa[i].hmainid}','{listCa[i].Hsubid}'," +
+ $"{listCa[i].HSupID},{listCa[i].HWHID},'{listCa[i].閫�鏂欏師鍥爙',{listCa[i].閫�鍥炴暟閲弣", "h_p_JIT_BackGoods_QACheck");
+ if (ds.Tables[0].Rows[0][0].ToString() == "1")
+ {
+ a++;
+ }
+ }
+ if (a == listCa.Count)
+ {
+ objJsonResult.code = ds.Tables[0].Rows[0][0].ToString();
+ objJsonResult.count = int.Parse(ds.Tables[0].Rows[0][0].ToString());
+ objJsonResult.Message = ds.Tables[0].Rows[0][1].ToString();
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else if(a>0&&a<listCa.Count)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈叏閮ㄥ搧璐ㄧ‘璁�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = ds.Tables[0].Rows[0][0].ToString();
+ objJsonResult.count = int.Parse(ds.Tables[0].Rows[0][0].ToString());
+ objJsonResult.Message = ds.Tables[0].Rows[0][1].ToString();
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 閫�鏂欑‘璁� 浠撳簱鎺ユ敹
+ [Route("Sc_CallGoodsBackRequestBill/JIT_BackGoodsList_CKJS")]
+ [HttpPost]
+ public object JIT_BackGoodsList_CKJS([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string[] sArray = _value.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string user = sArray[1].ToString();
+ try
+ {
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", "");
+
+ List<JIT_BackGoods_PZQR> listCa = new List<JIT_BackGoods_PZQR>();
+ //鑾峰彇琛ㄦ牸鏁版嵁闆嗗悎
+ listCa = JsonConvert.DeserializeObject<List<JIT_BackGoods_PZQR>>(msg2.ToString());
+
+ int a = 0;
+ for (int i = 0; i < listCa.Count; i++)
+ {
+ ds = oCN.RunProcReturn($"exec h_p_JIT_BackGoods_WHReceive {listCa[i].hmainid},{listCa[i].Hsubid}," +
+ $"{listCa[i].HSPID},'{user}'", "h_p_JIT_BackGoods_WHReceive");
+
+ if (ds.Tables[0].Rows[0][0].ToString() == "1")
+ {
+ a++;
+ }
+ }
+ if (a == listCa.Count)
+ {
+ objJsonResult.code = ds.Tables[0].Rows[0][0].ToString();
+ objJsonResult.count = int.Parse(ds.Tables[0].Rows[0][0].ToString());
+ objJsonResult.Message = ds.Tables[0].Rows[0][1].ToString();
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else if (a > 0 && a < listCa.Count)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈叏閮ㄤ粨搴撴帴鏀�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = ds.Tables[0].Rows[0][0].ToString();
+ objJsonResult.count = int.Parse(ds.Tables[0].Rows[0][0].ToString());
+ objJsonResult.Message = ds.Tables[0].Rows[0][1].ToString();
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1