From a1709bcc95fe641126f5c34e0a344e406b467f88 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 16 五月 2023 11:11:15 +0800
Subject: [PATCH] 流转卡和生产订单只能自己删除自己的单据。pda进站单增加白坯发布字段，放在接收数量后面，不允许编辑，每次扫进站单出站单的时候，自动把白坯发布的汇总数量显示。生产订单模块增加一个字段，是否取库存,底部备注，做成下拉框。生产报表这个字段有值的不计算产能。工艺路线批量插入白坯定型和染厂（第一道和第二道）（把以前所有的流水号加20，在把白坯定型（10），和染厂（20）刷进去
---
WebAPI/Controllers/CJGL/Cj_CallGoodsBillBackController.cs | 21 ++-------------------
1 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_CallGoodsBillBackController.cs b/WebAPI/Controllers/CJGL/Cj_CallGoodsBillBackController.cs
index e210529..c71dd6c 100644
--- a/WebAPI/Controllers/CJGL/Cj_CallGoodsBillBackController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_CallGoodsBillBackController.cs
@@ -58,25 +58,8 @@
}
CallGoodsBill ca = JsonConvert.DeserializeObject<CallGoodsBill>(sWhere);
- oCN.RunProc($"exec h_p_JIT_BackGoodsBillList_Query '{ca.HBillNo}','{ca.MaterialNumber}','{ca.MaterialName}','{ca.MaterialModel}'," +
- $"'{ca.ProcMul}','{ca.HDeptName}',{ca.HOrgID},'{ca.Hmaker}','{ca.HPZStatus}','{ca.HCKStatus}','{ca.HBeginDate}','{ca.HEndDate.AddDays(1).AddSeconds(-1)}'");
-
- if (ca.HPZStatus == "鍏ㄩ儴" && ca.HCKStatus == "鍏ㄩ儴")
- {
- ds = oCN.RunProcReturn("select * from ##h_p_JIT_BackGoodsBillList_Query1 where 1=1 " + ca.Arbitrarily + "", "##h_p_JIT_BackGoodsBillList_Query1");
- }
- else if (ca.HPZStatus != "鍏ㄩ儴" && ca.HCKStatus == "鍏ㄩ儴")
- {
- ds = oCN.RunProcReturn("select * from ##h_p_JIT_BackGoodsBillList_Query2 where 1=1 " + ca.Arbitrarily + "", "##h_p_JIT_BackGoodsBillList_Query2");
- }
- else if (ca.HPZStatus == "鍏ㄩ儴" && ca.HCKStatus != "鍏ㄩ儴")
- {
- ds = oCN.RunProcReturn("select * from ##h_p_JIT_BackGoodsBillList_Query3 where 1=1 " + ca.Arbitrarily + "", "##h_p_JIT_BackGoodsBillList_Query3");
- }
- else if (ca.HPZStatus != "鍏ㄩ儴" && ca.HCKStatus != "鍏ㄩ儴")
- {
- ds = oCN.RunProcReturn("select * from ##h_p_JIT_BackGoodsBillList_Query4 where 1=1 " + ca.Arbitrarily + "", "##h_p_JIT_BackGoodsBillList_Query4");
- }
+ ds = oCN.RunProcReturn($"exec h_p_JIT_BackGoodsBillList_Query '{ca.HBillNo}','{ca.MaterialNumber}','{ca.MaterialName}','{ca.MaterialModel}'," +
+ $"'{ca.ProcMul}','{ca.HDeptName}',{ca.HOrgID},'{ca.Hmaker}','{ca.HPZStatus}','{ca.HCKStatus}','{ca.HBeginDate}','{ca.HEndDate.AddDays(1).AddSeconds(-1)}'", "h_p_JIT_BackGoodsBillList_Query");
objJsonResult.code = "1";
objJsonResult.count = 1;
--
Gitblit v1.9.1