From 6f7e999691fc768d427b7130c9fcc7f3017e1fbc Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 16 五月 2024 17:07:29 +0800
Subject: [PATCH] 1.销售管理,仓库管理 所有的 新增 审核 反审核 删除 增加 进行 会计期间 结账 的判断和控制 2.岗位技能清单 和 员工技能清单 表头 增加 2个 字段； HMaterID int --产品编码（gy_Material） HProcID int --工序（gy_Process）
---
WebAPI/Controllers/仓存管理/条码生成/Gy_BarCodeBill_OutController.cs | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill_OutController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill_OutController.cs"
index 8c1e782..b2fe0bd 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill_OutController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill_OutController.cs"
@@ -238,8 +238,18 @@
string HBarCode_Pack = list[0].HBarCode_Pack;
long HCustomQty1 = list[0].HCustomQty1;
DateTime HProduceDate = list[0].HProduceDate; //鐢熶骇鏃ユ湡锛堜繚璐ㄦ湡鐢級
- DateTime HExpiryDate = list[0].HExpiryDate; //淇濊川鏈熻嚦锛堜繚璐ㄦ湡鐢級
-
+ DateTime HExpiryDate = list[0].HExpiryDate; //淇濊川鏈熻嚦锛堜繚璐ㄦ湡鐢級
+
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = DateTime.Now;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.Message = s;
+ return objJsonResult;
+ }
////鍒ゆ柇鏉冮檺
//if (!ClsPub.Security_Log(msg5, 1, false, msg4))
@@ -365,6 +375,17 @@
{
try
{
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = DateTime.Now;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.Message = s;
+ return objJsonResult;
+ }
+
oCN.BeginTran();
oCN.RunProc("Delete From Gy_BarCodeBill_Out where HItemID = " + HItemID);
oCN.Commit();
--
Gitblit v1.9.1