From f5d2faea9232e3654bb47832f4e57b72e00309a6 Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期五, 31 十二月 2021 11:24:55 +0800
Subject: [PATCH] 完善 其他模块 分步式调入 查询
---
WebAPI/Controllers/博日自动扫码线/ScanlineAPIController.cs | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 5 deletions(-)
diff --git "a/WebAPI/Controllers/\345\215\232\346\227\245\350\207\252\345\212\250\346\211\253\347\240\201\347\272\277/ScanlineAPIController.cs" "b/WebAPI/Controllers/\345\215\232\346\227\245\350\207\252\345\212\250\346\211\253\347\240\201\347\272\277/ScanlineAPIController.cs"
index 1b23643..0e1a8c2 100644
--- "a/WebAPI/Controllers/\345\215\232\346\227\245\350\207\252\345\212\250\346\211\253\347\240\201\347\272\277/ScanlineAPIController.cs"
+++ "b/WebAPI/Controllers/\345\215\232\346\227\245\350\207\252\345\212\250\346\211\253\347\240\201\347\272\277/ScanlineAPIController.cs"
@@ -108,6 +108,14 @@
objJsonResult.data = null;
return objJsonResult;
}
+ ds = oCN.RunProcReturn("Select * from Gy_BarCodeBill where HBarCode='" + list.packagebarcode.ToString().Trim() + "' and HStopflag='1'", "Gy_BarCodeBill");
+ if (ds != null && ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.status = -1;
+ objJsonResult.msg = "姝ょ鏉＄爜宸蹭綔搴�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
Models.ClsSc_PackUnionBillMain oItem = new ClsSc_PackUnionBillMain();
oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
@@ -120,7 +128,7 @@
oItem.HCheckItemNowID = 0;
oItem.HCheckItemNextID = 0;
oItem.HCheckFlowID = 0;
- oItem.HRemark = "鑷姩鍖呰绾跨敓杈扮鏉＄爜";
+ oItem.HRemark = "鑷姩鍖呰绾跨敓鎴愮鏉＄爜";
oItem.HBacker = "";
oItem.HBackDate = "";
oItem.HMaker = "";
@@ -219,14 +227,31 @@
{
try
{
+ ds = oCN.RunProcReturn("Select * from Gy_BarCodeBill where HBarCode='" + packagebarcode.ToString().Trim() + "'", "Gy_BarCodeBill");
+ if (ds == null && ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.status = -1;
+ objJsonResult.msg = "鏃犳晥绠辨潯鐮�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ ds = oCN.RunProcReturn("Select * from Gy_BarCodeBill where HBarCode='" + packagebarcode.ToString().Trim() + "' and HStopflag='1'", "Gy_BarCodeBill");
+ if (ds != null && ds.Tables[0].Rows.Count>0)
+ {
+ objJsonResult.status = -1;
+ objJsonResult.msg = "姝ょ鏉＄爜宸蹭綔搴�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//
oCN.BeginTran();
//鍒犻櫎瀛愯〃
- oCN.RunProc("Delete From Sc_PackUnionBillSub where HBarCode_Pack=" + packagebarcode.ToString());
+ oCN.RunProc("Delete From Sc_PackUnionBillSub where HBarCode_Pack='"+ packagebarcode.ToString() + "'");
//鍒犻櫎涓昏〃
- oCN.RunProc("Delete From Sc_PackUnionBillMain where HBarCode_Pack=" + packagebarcode.ToString());
- //鍒犻櫎鏉＄爜妗ｆ琛�
- oCN.RunProc("Delete From Gy_BarCodeBill where HBarCode=" + packagebarcode.ToString());
+ oCN.RunProc("Delete From Sc_PackUnionBillMain where HBarCode_Pack='" + packagebarcode.ToString() + "'");
+ //浣滃簾鏉＄爜妗ｆ琛�
+ oCN.RunProc("Update Gy_BarCodeBill set HStopflag='1' where HBarCode='"+ packagebarcode .ToString()+ "'");
oCN.Commit();
@@ -244,5 +269,29 @@
}
}
#endregion
+
+
+ [Route("packagebarcode/week")]
+ [HttpPost]
+ public object week(string tim)
+ {
+ try
+ {
+ GetWeekList list = new GetWeekList();
+ //string aa=list.getWeek(Convert.ToDateTime(tim));
+ string aa = list.GetCodeDateStr(Convert.ToDateTime(tim));
+ objJsonResult.status = 0;
+ objJsonResult.msg =aa.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.status = -1;
+ objJsonResult.msg = e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.1