From dabd6d20c31442d461fc30c49aa04abd4549be6b Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 10 三月 2023 13:30:53 +0800
Subject: [PATCH] wip页面优化
---
WebAPI/Controllers/生产管理/生产任务单/Sc_ICMOBillController.cs | 51 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 41 insertions(+), 10 deletions(-)
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
index 3ac7d95..0a95287 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
@@ -112,17 +112,27 @@
{
//涓昏〃
oCN.RunProc(@"Insert Into Sc_ICMOBillMain
- (HBillType,HInterID,HBillNo,HDate,HPRDORGID
+ (HBillType,HBillStatus,HInterID,HBillNo,HDate,HPRDORGID
,HYear,HPeriod,HRemark,HMaker,HMakeDate
,HSeOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HEmpID,HCusID
,HCenterID,HPlanQty,HDeptID,HMaterID,HUnitID,HBomID,HPlanBeginDate,HPlanEndDate,HISENTRUST,HISREWORK)
- values('3710'," + HInterID + ",'" + HBillNo + "','" + HDate + "'," + HPRDORGID +
+ values('3710',1," + HInterID + ",'" + HBillNo + "','" + HDate + "'," + HPRDORGID +
"," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + HRemark + "','" + HMaker + "',getdate()" +
",'" + HSeOrderBillNo + "'," + HSeOrderInterID + "," + HSeOrderEntryID + "," + HEmpID + "," + HCusID +
"," + HCenterID + "," + HPlanQty + ",0,0,0,0,'',''" + "," + HISENTRUST + "," + HISREWORK + ") ");
}
else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
- { //淇敼
+ {
+ if (ds.Tables[0].Rows[0]["瀹℃牳浜�"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�,涓嶅厑璁镐慨鏀�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //淇敼
oCN.RunProc("update Sc_ICMOBillMain set " +
"HRemark='" + HRemark + "', HChecker='" + HMaker + "', HCheckDate=getdate()" +
", HSeOrderBillNo='" + HSeOrderBillNo + "', HSeOrderInterID=" + HSeOrderInterID + ", HSeOrderEntryID=" + HSeOrderEntryID + ", HEmpID=" + HEmpID + ", HCusID=" + HCusID + "" +
@@ -233,12 +243,13 @@
,HBeginDate,HEndDate
,HMaterID,HUnitID,HRemark,HSourceID,HDeptID,HSTATUS
,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney
- ,HINSTOCKTYPE,HCHECKPRODUCT,HQAIP,HISBACKFLUSH,HREQSRC,HSTOCKINQUASELAUXQTY,HSeOrderEntrySEQ,HPROJECTNO,HPRODUCTTYPE,HCOSTRATE,HBASEUNITID)
+ ,HINSTOCKTYPE,HCHECKPRODUCT,HQAIP,HISBACKFLUSH,HREQSRC,HSTOCKINQUASELAUXQTY,HSeOrderEntrySEQ,HPROJECTNO,HPRODUCTTYPE,HCOSTRATE,HBASEUNITID
+ ,HSTOCKINORGID)
values({HInterID},{i},{(oSub.HQty == null ? 0 : oSub.HQty)}
,'{(oSub.HPlanBeginDate == null ? DateTime.Now.ToString("yyyy-MM-dd") : oSub.HPlanBeginDate.ToString())}','{(oSub.HPlanEndDate == null ? DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") : oSub.HPlanEndDate.ToString())}'
,'{(oSub.HPlanBeginDate == null ? DateTime.Now.ToString("yyyy-MM-dd") : oSub.HPlanBeginDate.ToString())}','{(oSub.HPlanEndDate == null ? DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") : oSub.HPlanEndDate.ToString())}'
,{oSub.HMaterID},{oSub.HUnitID},'{oSub.HRemark}',{oSub.HSourceID},{oSub.HDeptID},{oSub.HSTATUS}
- ,0,0,'','',0,0,{HINSTOCKTYPE},{HCHECKPRODUCT},{HQAIP},{HISBACKFLUSH},{HREQSRC},{HSTOCKINQUASELAUXQTY},{HSeOrderEntrySEQ},{HPROJECTNO},{HPRODUCTTYPE},{HCOSTRATE},{HBASEUNITID})");
+ ,0,0,'','',0,0,{HINSTOCKTYPE},{HCHECKPRODUCT},{HQAIP},{HISBACKFLUSH},{HREQSRC},{HSTOCKINQUASELAUXQTY},{HSeOrderEntrySEQ},{HPROJECTNO},{HPRODUCTTYPE},{HCOSTRATE},{HBASEUNITID},{oSub.HSTOCKINORGID})");
}
objJsonResult.code = "1";
@@ -434,17 +445,27 @@
{
//涓昏〃
oCN.RunProc(@"Insert Into Sc_ICMOBillMain
- (HBillType,HInterID,HBillNo,HDate,HPRDORGID
+ (HBillType,HBillStatus,HInterID,HBillNo,HDate,HPRDORGID
,HYear,HPeriod,HRemark,HMaker,HMakeDate
,HSeOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HEmpID,HCusID
,HCenterID,HPlanQty,HDeptID,HMaterID,HUnitID,HBomID,HPlanBeginDate,HPlanEndDate)
- values('3710'," + HInterID + ",'" + HBillNo + "','" + HDate + "'," + HPRDORGID +
+ values('3710',1," + HInterID + ",'" + HBillNo + "','" + HDate + "'," + HPRDORGID +
"," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + HRemark + "','" + HMaker + "',getdate()" +
",'" + HSeOrderBillNo + "'," + HSeOrderInterID + "," + HSeOrderEntryID + "," + HEmpID + "," + HCusID +
"," + HCenterID + ",0,0,0,0," + HBomID + ",'','') ");
}
else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
- { //淇敼
+ {
+ if (ds.Tables[0].Rows[0]["瀹℃牳浜�"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�,涓嶅厑璁镐慨鏀�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //淇敼
oCN.RunProc("update Sc_ICMOBillMain set " +
"HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" +
", HSeOrderBillNo='" + HSeOrderBillNo + "', HSeOrderInterID=" + HSeOrderInterID + ", HSeOrderEntryID=" + HSeOrderEntryID + ", HEmpID=" + HEmpID + ", HCusID=" + HCusID + "" +
@@ -534,13 +555,13 @@
,HPlanBeginDate,HPlanEndDate
,HBeginDate,HEndDate
,HMaterID,HUnitID,HRemark,HSourceID,HDeptID,HSTATUS
- ,HBomID,HEntryCusID
+ ,HBomID,HEntryCusID,HSTOCKINORGID
,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney)
values({HInterID},{HEntryID},{(oSub.HQty == null ? 0 : oSub.HQty)}
,'{(oSub.HPlanBeginDate == null ? DateTime.Now.ToString("yyyy-MM-dd") : oSub.HPlanBeginDate.ToString())}','{(oSub.HPlanEndDate == null ? DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") : oSub.HPlanEndDate.ToString())}'
,'{(oSub.HBeginDate == null ? DateTime.Now.ToString("yyyy-MM-dd") : oSub.HBeginDate.ToString())}','{(oSub.HEndDate == null ? DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") : oSub.HEndDate.ToString())}'
,{oSub.HMaterID},{oSub.HUnitID},'{oSub.HRemark}',{oSub.HSourceID},{oSub.HDeptID},{oSub.HSTATUS}
- ,{oSub.HBomID} ,{oSub.HCusID}
+ ,{oSub.HBomID} ,{oSub.HCusID} ,{oSub.HSTOCKINORGID}
,0,0,'','',0,0)");
@@ -822,6 +843,16 @@
objJsonResult.data = null;
return objJsonResult; ;
}
+
+ if (int.Parse(ds.Tables[0].Rows[0]["HBillStatus"].ToString()) > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶆槸鏈鏍哥姸鎬�,涓嶅厑璁稿垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+
oCN.RunProc("delete from Sc_ICMOBillMain where HInterID=" + HInterID);
oCN.RunProc("delete from Sc_ICMOBillSub where HInterID=" + HInterID);
oCN.Commit();//鎻愪氦浜嬪姟
--
Gitblit v1.9.1