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/ProductInController.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs
index 4a98976..8291829 100644
--- a/WebAPI/Controllers/ProductInController.cs
+++ b/WebAPI/Controllers/ProductInController.cs
@@ -358,8 +358,9 @@
{
WebS.WebService1 oWebs = new WebS.WebService1();
WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
+ string sBarCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo, sMaker);
string sExpressNumber = "";
- WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, (double)sQty, HOWNERID, ref ClsPub.sErrInfo);
+ WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sBarCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, (double)sQty, HOWNERID, ref ClsPub.sErrInfo);
bool flag = WebSoBar == null;
object result;
if (flag)
@@ -1238,8 +1239,8 @@
List<ClsKf_ProductInBillMain> list = new List<ClsKf_ProductInBillMain>();
ListModels listModels = new ListModels();
list = listModels.getProductInBillMainByJson(jsonString);
- list[0].HYear = ClsPub.isLong(DateTime.Now.Year);
- list[0].HDate = ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
+ //list[0].HYear = ClsPub.isLong(DateTime.Now.Year);
+ //list[0].HDate = ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
string hbillType = list[0].HBillType;
WebAPI.WebS.ClsKf_ProductInBillMain clsKf_ProductInBillMain = new WebAPI.WebS.ClsKf_ProductInBillMain();
clsKf_ProductInBillMain.HInterID = list[0].HInterID;
--
Gitblit v1.9.1