From 3713a17fe36d877ce3e588c1dc08526fc8afffdc Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 23 十月 2025 09:26:31 +0800
Subject: [PATCH] 111
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/MedicineGoodsServices.cs | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/MedicineGoodsServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/MedicineGoodsServices.cs"
index aa0ab04..ad079ef 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/MedicineGoodsServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/MedicineGoodsServices.cs"
@@ -7,6 +7,7 @@
using System.Security.Policy;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
@@ -41,18 +42,18 @@
var url = "http://121.37.118.63:80/GYZ2/95fck/goodsInfo";
- if (string.IsNullOrEmpty(SearchDate)) SearchDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ //if (string.IsNullOrEmpty(SearchDate)) SearchDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
//璇锋眰鍙傛暟
var requestData = new
{
- searchDate = "2009-1-10 20:45:16" // 姝ｇ‘鐨勬牸寮�
+ searchDate = "2009-01-10 20:45:16" // 姝ｇ‘鐨勬牸寮�
};
//if (string.IsNullOrEmpty(SearchDate))
//{
// // 榛樿鏌ヨ杩囧幓24灏忔椂鐨勬暟鎹�
// SearchDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");
//}
- //// 璇锋眰鍙傛暟
+ // 璇锋眰鍙傛暟
//var requestData = new
//{
// searchDate = SearchDate
@@ -84,7 +85,7 @@
var entityList = response.data.Where(Medicat => !existingGoodsNos.Contains(Medicat.goods_no)).Select(Medicat => new Dt_MaterielInfo
{
MaterielCode = Medicat.goods_no,
- MaterielErpType = Medicat.materialCode,
+ MaterielErpType = Medicat.goods_type,
item = Medicat.goods_tym, //閫氱敤鍚�
MaterielName = Medicat.goods_spm,//鐗╂枡鍚嶇О
MaterielSpec = Medicat.model,
@@ -126,7 +127,8 @@
{
//鍏堟壘鍒版墍鏈夋湭涓嬪彂鐨勮嵂鍝�
//var list = BaseDal.QueryData(x => x.GoodStatus == "鏈笅鍙�").ToList();
- var list =BaseDal.Db.Queryable<Dt_MaterielInfo>().Where(x => x.GoodStatusState == "鏈笅鍙�").ToList();
+ //鎶婂皬浠舵湭涓嬪彂鐨勭殑淇℃伅
+ var list =BaseDal.Db.Queryable<Dt_MaterielInfo>().Where(x => x.GoodStatusState == "鏈笅鍙�"&& x.MaterielSourceType== MaterielSourceTypeEnum.SelfMadePart).ToList();
if (list == null || !list.Any())
{
return new WebResponseContent().OK("鏃犳湭涓嬪彂鑽搧");
@@ -152,15 +154,15 @@
//鍗曚綅
unit = item.MaterielUnit,
//闀�
- singleProductLongNum = item.MaterielLength.ToString(),
+ singleProductLongNum = (item.MaterielLength ?? 0).ToString(),
//瀹�
- singleProductWideNum = item.MaterielWide.ToString(),
+ singleProductWideNum = (item.MaterielWide ?? 0).ToString(),
//楂�
- singleProductHighNum = item.MaterielHeight.ToString(),
+ singleProductHighNum = (item.MaterielHeight ?? 0).ToString(),
//閲嶉噺
- singleProductWeight = item.MaterielWeight.ToString(),
+ singleProductWeight = (item.MaterielWeight ?? 0).ToString(),
//浣撶Н
- singleProductVolume = item.MaterielVolume.ToString(),
+ singleProductVolume = (item.MaterielVolume ?? 0).ToString(),
//鏄惁鍙栨秷 0鏄笉鍒犻櫎锛�1鍒犻櫎
isDelete = "0"
};
@@ -173,7 +175,7 @@
//鏇存柊鑽搧鐘舵��-宸插畬鎴�
BaseDal.Db.Updateable<Dt_MaterielInfo>()
.SetColumns(x => x.GoodStatusState == "涓嬪彂瀹屾垚")
- .Where(x => x.GoodStatusState == item.MaterielCode)
+ .Where(x => x.MaterielCode == item.MaterielCode)
.ExecuteCommand();
}
else
--
Gitblit v1.9.3