Controllers/Warehouse/MesCgthSqController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Controllers/Warehouse/MesItemBlController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Controllers/Warehouse/TransferOutController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Dto/service/OutItemDto.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
entity/MesCgthSq.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
entity/MesCgthSqDetail.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
entity/MesInvItemArn.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
entity/MesInvItemIns.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
service/Warehouse/MesCgthSqManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
service/Warehouse/MesInvItemInCDetailsManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
service/Warehouse/MesInvItemOutsManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
service/Warehouse/MesItemTblManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
service/Warehouse/TransferOutManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Controllers/Warehouse/MesCgthSqController.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,234 @@ using System.Dynamic; using Microsoft.AspNetCore.Mvc; using NewPdaSqlServer.Dto.service; using NewPdaSqlServer.entity; using NewPdaSqlServer.service.Warehouse; using NewPdaSqlServer.util; namespace NewPdaSqlServer.Controllers.Warehouse; [ApiController] [Route("api/[controller]")] public class MesCgthSqController : ControllerBase { private readonly MesCgthSqManager m = new(); /// <summary> /// è·åææå·²ç»å®¡æ ¸çç³è¯·å /// </summary> /// <returns></returns> [HttpPost("GetMesCgthSq")] public ResponseResult GetMesCgthSq() { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.GetMesCgthSq(); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// è·åææå·²ç»å®¡æ ¸çç³è¯·å /// </summary> /// <returns></returns> [HttpPost("GetSumItem")] public ResponseResult GetSumItem(WarehouseQuery query) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.GetSumItem(query); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } //ScanCode /// <summary> /// è·åææå·²ç»å®¡æ ¸çç³è¯·å /// </summary> /// <returns></returns> [HttpPost("ScanCode")] public ResponseResult ScanCode(WarehouseQuery query) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.ScanCode(query); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// è·åææ /// </summary> /// <returns></returns> [HttpPost("GetList")] public ResponseResult GetList() { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.GetList(); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// æ ¹æ®ä¸»é®è·å /// </summary> /// <returns></returns> [HttpPost("GetById")] public ResponseResult GetById(int id) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.GetById(id); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// æ ¹æ®ä¸»é®å é¤ /// </summary> /// <returns></returns> [HttpPost("DeleteByIds")] public ResponseResult DeleteByIds([FromBody] object[] ids) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.DeleteByIds(ids); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// æ·»å /// </summary> /// <returns></returns> [HttpPost("Insert")] public ResponseResult Add([FromBody] MesCgthSq data) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.Insert(data); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// æ·»å è¿åèªå¢ /// </summary> /// <returns></returns> [HttpPost("InsertReturnIdentity")] public ResponseResult InsertReturnIdentity([FromBody] MesCgthSq data) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.InsertReturnIdentity(data); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// ä¿®æ¹ /// </summary> /// <returns></returns> [HttpPost("Update")] public ResponseResult Update([FromBody] MesCgthSq data) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.Update(data); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } } Controllers/Warehouse/MesItemBlController.cs
@@ -163,38 +163,35 @@ } /// <summary> /// ç产补æåæ¡ç æå /// ç产补æåæ¡ç æå /// </summary> /// <param name="query">æ¥è¯¢åæ°</param> /// <returns>æåç»æåå¾ å¤çå表</returns> /// <remarks> /// 请æ±ç¤ºä¾: /// /// 请æ±ç¤ºä¾: /// POST /api/MesItemBl/SplitBarcode /// { /// "billNo": "WO202401010001", // å·¥åå·(å¿ å¡«) /// "barcode": "BC001", // æ¡ç å·(å¿ å¡«) /// "userName": "admin", // ç¨æ·å(å¿ å¡«) /// "blNo": "BL202401010001", // è¡¥æåå·(å¿ å¡«) /// "Num": 10 // æåæ°é(å¿ å¡«,å¿ é¡»å¤§äº0) /// "billNo": "WO202401010001", // å·¥åå·(å¿ å¡«) /// "barcode": "BC001", // æ¡ç å·(å¿ å¡«) /// "userName": "admin", // ç¨æ·å(å¿ å¡«) /// "blNo": "BL202401010001", // è¡¥æåå·(å¿ å¡«) /// "Num": 10 // æåæ°é(å¿ å¡«,å¿ é¡»å¤§äº0) /// } /// /// ä¸å¡å¤çï¼ /// - éªè¯è¡¥æåç¶æ /// - éªè¯æ¡ç åºåä¿¡æ¯ /// - éªè¯æåæ°éæ¯å¦åç /// - æ§è¡æ¡ç æåäºå¡å¤ç /// - æ´æ°å·¥ååè¡¥æåç¸å ³æ°é /// /// è¿åæ°æ®å å«ï¼ /// - success: æåæ¯å¦æå /// - pendingList: å¾ å¤çæç»å表ï¼å å«ï¼ /// * Bld012: ç©æID /// * Bld002: ç©æç¼å· /// * Bld003: ç©æåç§° /// * Bld004: ç©æè§æ ¼ /// * Bld007: è®¡åæ°é /// * Bld008: 已补æ°é /// ä¸å¡å¤çï¼ /// - éªè¯è¡¥æåç¶æ /// - éªè¯æ¡ç åºåä¿¡æ¯ /// - éªè¯æåæ°éæ¯å¦åç /// - æ§è¡æ¡ç æåäºå¡å¤ç /// - æ´æ°å·¥ååè¡¥æåç¸å ³æ°é /// è¿åæ°æ®å å«ï¼ /// - success: æåæ¯å¦æå /// - pendingList: å¾ å¤çæç»å表ï¼å å«ï¼ /// * Bld012: ç©æID /// * Bld002: ç©æç¼å· /// * Bld003: ç©æåç§° /// * Bld004: ç©æè§æ ¼ /// * Bld007: è®¡åæ°é /// * Bld008: 已补æ°é /// </remarks> /// <response code="200">æåæå</response> /// <response code="400">æå失败ï¼è¿åå ·ä½é误信æ¯</response> Controllers/Warehouse/TransferOutController.cs
@@ -7,7 +7,7 @@ namespace NewPdaSqlServer.Controllers.Warehouse; /// <summary> /// è°æ¨åºåºç¸å ³æ¥å£ /// è°æ¨åºåºç¸å ³æ¥å£ /// </summary> [Route("api/[controller]")] [ApiController] @@ -18,7 +18,7 @@ #region åºç¡CRUD /// <summary> /// è·åææè°æ¨åºåºå /// è·åææè°æ¨åºåºå /// </summary> /// <returns>è°æ¨åºåºåå表</returns> [HttpPost("GetList")] @@ -46,11 +46,11 @@ #region è°æ¨åºåºä¸å¡ /// <summary> /// è·åæªå®æçè°æ¨åºåºåå·å表 /// è·åæªå®æçè°æ¨åºåºåå·å表 /// </summary> /// <returns>æªå®æçè°æ¨åºåºåå·å表</returns> /// <remarks> /// è·åç³è¯·æ°é(sq)ä¸çäºå·²æ«æ°é(ys)çè°æ¨åºåºåå·å表 /// è·åç³è¯·æ°é(sq)ä¸çäºå·²æ«æ°é(ys)çè°æ¨åºåºåå·å表 /// </remarks> /// <response code="200">æåè·åè°æ¨åºåºåå·å表</response> /// <response code="400">è·å失败</response> @@ -75,33 +75,33 @@ } /// <summary> /// æ ¹æ®åæ®å·è·åå¾ å¤ççè°æ¨åºåºæç»å表 /// æ ¹æ®åæ®å·è·åå¾ å¤ççè°æ¨åºåºæç»å表 /// </summary> /// <param name="query">æ¥è¯¢åæ°</param> /// <returns>å¾ å¤ççè°æ¨åºåºæç»å表</returns> /// <remarks> /// 请æ±ç¤ºä¾: /// /// 请æ±ç¤ºä¾: /// POST /api/TransferOut/GetTransferOutDetailListByBillNo /// { /// "billNo": "DB202401010001" // è°æ¨åå·(å¿ å¡«) /// "billNo": "DB202401010001" // è°æ¨åå·(å¿ å¡«) /// } /// /// è¿åæªå®æçæç»è®°å½(ShNum-YsNum>0)ï¼å å«ï¼ /// - ItemNo: ç©æç¼å· /// - ItemModel: ç©æè§æ ¼ /// - ShNum: ç³è¯·æ°é /// - YsNum: å·²æ«æ°é /// è¿åæªå®æçæç»è®°å½(ShNum-YsNum>0)ï¼å å«ï¼ /// - ItemNo: ç©æç¼å· /// - ItemModel: ç©æè§æ ¼ /// - ShNum: ç³è¯·æ°é /// - YsNum: å·²æ«æ°é /// </remarks> /// <response code="200">æåè·åè°æ¨åºåºæç»</response> /// <response code="400">è·å失败ï¼è¿åå ·ä½é误信æ¯</response> [HttpPost("GetTransferOutDetailListByBillNo")] public ResponseResult GetTransferOutDetailListByBillNo([FromBody] WarehouseQuery query) public ResponseResult GetTransferOutDetailListByBillNo( [FromBody] WarehouseQuery query) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = _manager.GetTransferOutDetailListByBillNo(query); resultInfos.tbBillList = _manager.GetTransferOutDetailListByBillNo(query); return new ResponseResult { status = 0, @@ -116,30 +116,27 @@ } /// <summary> /// æ«ææ¡ç è¿è¡è°æ¨åºåºå¤ç /// æ«ææ¡ç è¿è¡è°æ¨åºåºå¤ç /// </summary> /// <param name="query">æ¥è¯¢åæ°</param> /// <returns>å¤çç»æåå¾ å¤çæç»</returns> /// <remarks> /// 请æ±ç¤ºä¾: /// /// 请æ±ç¤ºä¾: /// POST /api/TransferOut/ScanMoveBarcode /// { /// "billNo": "DB202401010001", // è°æ¨åå·(å¿ å¡«) /// "userName": "admin", // ç¨æ·å(å¿ å¡«) /// "barcode": "BC001" // æ¡ç å·(å¿ å¡«) /// "billNo": "DB202401010001", // è°æ¨åå·(å¿ å¡«) /// "userName": "admin", // ç¨æ·å(å¿ å¡«) /// "barcode": "BC001" // æ¡ç å·(å¿ å¡«) /// } /// /// ä¸å¡å¤çï¼ /// - éªè¯è°æ¨åç¶æ /// - éªè¯æ¡ç åºåä¿¡æ¯ /// - éªè¯ä»åºä¸è´æ§ /// - éªè¯æ°éæ¯å¦è¶ åºæªæ«æ°é /// - æ§è¡è°æ¨åºåºäºå¡å¤ç /// /// è¿åæ°æ®å å«ï¼ /// - form: å¤çç»æè¡¨å /// - items: å¾ å¤çæç»å表 /// ä¸å¡å¤çï¼ /// - éªè¯è°æ¨åç¶æ /// - éªè¯æ¡ç åºåä¿¡æ¯ /// - éªè¯ä»åºä¸è´æ§ /// - éªè¯æ°éæ¯å¦è¶ åºæªæ«æ°é /// - æ§è¡è°æ¨åºåºäºå¡å¤ç /// è¿åæ°æ®å å«ï¼ /// - form: å¤çç»æè¡¨å /// - items: å¾ å¤çæç»å表 /// </remarks> /// <response code="200">æ«ææå</response> /// <response code="400">æ«æå¤±è´¥ï¼è¿åå ·ä½é误信æ¯</response> Dto/service/OutItemDto.cs
@@ -12,5 +12,5 @@ public decimal? Quantity { get; set; } public List<MesInvItemOutItems>? SumItem { get; set; } public List<MesCgthSqDetail>? SumItem { get; set; } } entity/MesCgthSq.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,113 @@ using SqlSugar; namespace NewPdaSqlServer.entity; /// <summary> /// éè´éè´§ç³è¯· /// </summary> [SugarTable("MES_CGTH_SQ")] public class MesCgthSq { /// <summary> /// </summary> [SugarColumn(ColumnName = "ID")] public Guid Id { get; set; } /// <summary> /// åæ®ç¼ç /// </summary> [SugarColumn(ColumnName = "BILL_NO")] public string BillNo { get; set; } /// <summary> /// å建人 /// </summary> [SugarColumn(ColumnName = "CREATE_BY")] public string CreateBy { get; set; } /// <summary> /// å建æ¶é´ /// </summary> [SugarColumn(ColumnName = "CREATE_DATE")] public DateTime? CreateDate { get; set; } /// <summary> /// æåè·æ°äºº /// </summary> [SugarColumn(ColumnName = "LAST_UPDATE_USER")] public string LastUpdateUser { get; set; } /// <summary> /// æåä¿®æ¹æ¶é´ /// </summary> [SugarColumn(ColumnName = "LAST_UPDATE_TIME")] public DateTime? LastUpdateTime { get; set; } /// <summary> /// å®¡æ ¸äºº /// </summary> [SugarColumn(ColumnName = "CHECK_USER")] public string CheckUser { get; set; } /// <summary> /// å®¡æ ¸æ¶é´ /// </summary> [SugarColumn(ColumnName = "CHECK_DATE")] public DateTime? CheckDate { get; set; } /// <summary> /// å®¡æ ¸ç¶æ /// é»è®¤å¼: ((0)) /// </summary> [SugarColumn(ColumnName = "STATUS")] public bool? Status { get; set; } /// <summary> /// æ¯å¦å®æ /// é»è®¤å¼: ((0)) /// </summary> [SugarColumn(ColumnName = "IS_FINISH")] public bool? IsFinish { get; set; } /// <summary> /// éææ¹å¼ /// </summary> [SugarColumn(ColumnName = "RETURN_METHOD")] public string ReturnMethod { get; set; } /// <summary> /// éæç±»å /// </summary> [SugarColumn(ColumnName = "RETURN_TYPE")] public string ReturnType { get; set; } /// <summary> /// ä»åºid /// </summary> [SugarColumn(ColumnName = "DEPOT_ID")] public int? DepotId { get; set; } /// <summary> /// ä¾åºåid /// </summary> [SugarColumn(ColumnName = "SUPP_ID")] public int? SuppId { get; set; } /// <summary> /// 夿³¨ /// </summary> [SugarColumn(ColumnName = "REMARK")] public string Remark { get; set; } /// <summary> /// å§å¤æ è¯ /// </summary> [SugarColumn(ColumnName = "IS_OUT")] public bool? IsOut { get; set; } /// <summary> /// éè´§ç»ç»ID /// </summary> [SugarColumn(ColumnName = "TH_ORG_ID")] public string ThOrgId { get; set; } } entity/MesCgthSqDetail.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,97 @@ using SqlSugar; namespace NewPdaSqlServer.entity; /// <summary> /// éè´éè´§ç³è¯·æç» /// </summary> [SugarTable("MES_CGTH_SQ_DETAIL")] public class MesCgthSqDetail { /// <summary> /// </summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public Guid Id { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "MID")] public Guid? Mid { get; set; } /// <summary> /// å ¥åºåå· /// </summary> [SugarColumn(ColumnName = "INV_BILL_NO")] public string InvBillNo { get; set; } /// <summary> /// å ¥åºåè¡å· /// </summary> [SugarColumn(ColumnName = "INV_WORK_LINE")] public int? InvWorkLine { get; set; } /// <summary> /// éè´è®¢å /// </summary> [SugarColumn(ColumnName = "EBELN")] public string Ebeln { get; set; } /// <summary> /// éè´è®¢åid /// </summary> [SugarColumn(ColumnName = "EID")] public int? Eid { get; set; } /// <summary> /// éè´è®¢åè¡id /// </summary> [SugarColumn(ColumnName = "ERPID")] public int? Erpid { get; set; } /// <summary> /// ç©æid /// </summary> [SugarColumn(ColumnName = "ITEM_ID")] public int? ItemId { get; set; } /// <summary> /// ç³è¯·æ°é /// </summary> [SugarColumn(ColumnName = "SQ_NUM")] public decimal? SqNum { get; set; } /// <summary> /// å·²æ«æ°é /// </summary> [SugarColumn(ColumnName = "YS_NUM")] public decimal? YsNum { get; set; } /// <summary> /// 夿³¨ /// </summary> [SugarColumn(ColumnName = "REMARK")] public string Remark { get; set; } /// <summary> /// æ¯å¦å®æ /// </summary> [SugarColumn(ColumnName = "IS_FINISH")] public bool? IsFinish { get; set; } /// <summary> /// åºå· /// </summary> [SugarColumn(ColumnName = "ORDER_NO")] public int? OrderNo { get; set; } /// <summary> /// å ¥åºæç»çguid /// </summary> [SugarColumn(ColumnName = "RKMX_GUID")] public Guid? RkmxGuid { get; set; } [SugarColumn(IsIgnore = true)] public string? ItemName { get; set; } [SugarColumn(IsIgnore = true)] public string? ItemModel { get; set; } [SugarColumn(IsIgnore = true)] public string? ItemNo { get; set; } } entity/MesInvItemArn.cs
@@ -8,243 +8,243 @@ public class MesInvItemArn { /// <summary> /// ä¸»é® /// é»è®¤å¼: (newid()) ///</summary> /// ä¸»é® /// é»è®¤å¼: (newid()) /// </summary> [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)] public Guid Guid { get; set; } /// <summary> /// å°è´§åå· ///</summary> /// å°è´§åå· /// </summary> [SugarColumn(ColumnName = "bill_no")] public string? BillNo { get; set; } /// <summary> /// ç¶æ|0-æªå®¡æ ¸1-å®¡æ ¸å ¥åº\ç»æ¡ /// é»è®¤å¼: ((0)) ///</summary> /// ç¶æ|0-æªå®¡æ ¸1-å®¡æ ¸å ¥åº\ç»æ¡ /// é»è®¤å¼: ((0)) /// </summary> [SugarColumn(ColumnName = "status")] public int? Status { get; set; } /// <summary> /// åå ///</summary> /// åå /// </summary> [SugarColumn(ColumnName = "reason")] public string? Reason { get; set; } /// <summary> /// å建人 ///</summary> /// å建人 /// </summary> [SugarColumn(ColumnName = "create_by")] public string? CreateBy { get; set; } /// <summary> /// å建æ¶é´ ///</summary> /// å建æ¶é´ /// </summary> [SugarColumn(ColumnName = "create_date")] public DateTime? CreateDate { get; set; } /// <summary> /// æåæ´æ°äºº ///</summary> /// æåæ´æ°äºº /// </summary> [SugarColumn(ColumnName = "lastupdate_by")] public string? LastupdateBy { get; set; } /// <summary> /// æåæ´æ°æ¶é´ ///</summary> /// æåæ´æ°æ¶é´ /// </summary> [SugarColumn(ColumnName = "lastupdate_date")] public DateTime? LastupdateDate { get; set; } /// <summary> /// åæ®ç±»åID ///</summary> /// åæ®ç±»åID /// </summary> [SugarColumn(ColumnName = "bill_type_id")] public int? BillTypeId { get; set; } /// <summary> /// äºå¡ç±»åID ///</summary> /// äºå¡ç±»åID /// </summary> [SugarColumn(ColumnName = "transaction_id")] public int? TransactionId { get; set; } /// <summary> /// 夿³¨ ///</summary> /// 夿³¨ /// </summary> [SugarColumn(ColumnName = "remark")] public string? Remark { get; set; } /// <summary> /// éè´§åå· ///</summary> /// éè´§åå· /// </summary> [SugarColumn(ColumnName = "paper_bill_no")] public string? PaperBillNo { get; set; } /// <summary> /// éæäººå·¥å· ///</summary> /// éæäººå·¥å· /// </summary> [SugarColumn(ColumnName = "user_no_back")] public string? UserNoBack { get; set; } /// <summary> /// æäº¤äºº ///</summary> /// æäº¤äºº /// </summary> [SugarColumn(ColumnName = "check_user")] public string? CheckUser { get; set; } /// <summary> /// æäº¤æ¥æ ///</summary> /// æäº¤æ¥æ /// </summary> [SugarColumn(ColumnName = "check_date")] public DateTime? CheckDate { get; set; } /// <summary> /// å ¥åºæ¥æ ///</summary> /// å ¥åºæ¥æ /// </summary> [SugarColumn(ColumnName = "ins_date")] public DateTime? InsDate { get; set; } /// <summary> /// æ£éªç»æ ///</summary> /// æ£éªç»æ /// </summary> [SugarColumn(ColumnName = "check_res")] public string? CheckRes { get; set; } /// <summary> /// å·²æ¡æ°é ///</summary> /// å·²æ¡æ°é /// </summary> [SugarColumn(ColumnName = "check_qty")] public int? CheckQty { get; set; } /// <summary> /// ä»åºid ///</summary> /// ä»åºid /// </summary> [SugarColumn(ColumnName = "depots_id")] public string? DepotsId { get; set; } /// <summary> /// äºå¡ç±»åç¼ç ///</summary> /// äºå¡ç±»åç¼ç /// </summary> [SugarColumn(ColumnName = "transction_no")] public string? TransctionNo { get; set; } /// <summary> /// ä¾åºåid ///</summary> /// ä¾åºåid /// </summary> [SugarColumn(ColumnName = "supp_id")] public string? SuppId { get; set; } /// <summary> /// æäº¤ç¶æ /// é»è®¤å¼: ((0)) ///</summary> /// æäº¤ç¶æ /// é»è®¤å¼: ((0)) /// </summary> [SugarColumn(ColumnName = "fstatus")] public bool? Fstatus { get; set; } /// <summary> /// å·¥åç¼ç ///</summary> /// å·¥åç¼ç /// </summary> [SugarColumn(ColumnName = "factory")] public string? Factory { get; set; } /// <summary> /// æ¯å¦å·²ååSAP /// é»è®¤å¼: ((0)) ///</summary> /// æ¯å¦å·²ååSAP /// é»è®¤å¼: ((0)) /// </summary> [SugarColumn(ColumnName = "sapstatus")] public int? Sapstatus { get; set; } /// <summary> /// æ¯å¦æ£éª ///</summary> /// æ¯å¦æ£éª /// </summary> [SugarColumn(ColumnName = "ischeck")] public bool? Ischeck { get; set; } /// <summary> /// å®¡æ ¸å ¥åºäºº ///</summary> /// å®¡æ ¸å ¥åºäºº /// </summary> [SugarColumn(ColumnName = "insby")] public string? Insby { get; set; } /// <summary> /// å ¬å¸ä»£ç ///</summary> /// å ¬å¸ä»£ç /// </summary> [SugarColumn(ColumnName = "company")] public string? Company { get; set; } /// <summary> /// æ¥ææ è¯ /// é»è®¤å¼: ((0)) ///</summary> /// æ¥ææ è¯ /// é»è®¤å¼: ((0)) /// </summary> [SugarColumn(ColumnName = "urgent_flag")] public bool? UrgentFlag { get; set; } /// <summary> /// å²éäºå¡ç±»åç¼ç ///</summary> /// å²éäºå¡ç±»åç¼ç /// </summary> [SugarColumn(ColumnName = "mttransction_no")] public int? MttransctionNo { get; set; } /// <summary> /// IQCæ£éªåå· ///</summary> /// IQCæ£éªåå· /// </summary> [SugarColumn(ColumnName = "iqc_release_no")] public string? IqcReleaseNo { get; set; } /// <summary> /// æ¯å¦æ¾ç¤º /// é»è®¤å¼: ((0)) ///</summary> /// æ¯å¦æ¾ç¤º /// é»è®¤å¼: ((0)) /// </summary> [SugarColumn(ColumnName = "is_visual")] public int? IsVisual { get; set; } /// <summary> /// 0=éè´ï¼1=å§å¤ /// é»è®¤å¼: ((1)) ///</summary> /// 0=éè´ï¼1=å§å¤ /// é»è®¤å¼: ((1)) /// </summary> [SugarColumn(ColumnName = "f_type")] public bool? FType { get; set; } /// <summary> /// ERPå°è´§åID ///</summary> /// ERPå°è´§åID /// </summary> [SugarColumn(ColumnName = "ebeln_k3id")] public string? EbelnK3id { get; set; } /// <summary> /// æ¡ç æ¡å°è¿åº¦ ///</summary> /// æ¡ç æ¡å°è¿åº¦ /// </summary> [SugarColumn(ColumnName = "barcode_ratio")] public int? BarcodeRatio { get; set; } /// <summary> /// ERPåå· ///</summary> /// ERPåå· /// </summary> [SugarColumn(ColumnName = "erpno")] public string? Erpno { get; set; } /// <summary> /// æ¯å¦å·²éè´§0-æªéè´§ï¼1-éè´§ ///</summary> /// æ¯å¦å·²éè´§0-æªéè´§ï¼1-éè´§ /// </summary> [SugarColumn(ColumnName = "thstatus")] public int? Thstatus { get; set; } /// <summary> /// ERPéè´§åå· ///</summary> /// ERPéè´§åå· /// </summary> [SugarColumn(ColumnName = "erpthno")] public string? Erpthno { get; set; } /// <summary> /// ç»ç»ç¼ç ///</summary> /// ç»ç»ç¼ç /// </summary> [SugarColumn(ColumnName = "organize_code")] public string? OrganizeCode { get; set; } /// <summary> /// æ¶æç»ç» ///</summary> /// æ¶æç»ç» /// </summary> [SugarColumn(ColumnName = "ReceiveOrgId")] public string? ReceiveOrgId { get; set; } entity/MesInvItemIns.cs
@@ -9,321 +9,299 @@ public class MesInvItemIns { /// <summary> /// ID(SEQ_INV_ID) /// é»è®¤å¼: (newid()) ///</summary> /// ID(SEQ_INV_ID) /// é»è®¤å¼: (newid()) /// </summary> [SugarColumn(ColumnName = "GUID", IsPrimaryKey = true)] public Guid Guid { get; set; } /// <summary> /// å ¥åºåå· ///</summary> /// å ¥åºåå· /// </summary> [SugarColumn(ColumnName = "BILL_NO")] public string? BillNo { get; set; } /// <summary> /// ç¶æ|0-æªå®¡æ ¸1-å®¡æ ¸å ¥åº\\ç»æ¡ /// é»è®¤å¼: ((0)) ///</summary> /// ç¶æ|0-æªå®¡æ ¸1-å®¡æ ¸å ¥åº\\ç»æ¡ /// é»è®¤å¼: ((0)) /// </summary> [SugarColumn(ColumnName = "STATUS")] public byte? Status { get; set; } /// <summary> /// ä»åº ///</summary> /// ä»åº /// </summary> [SugarColumn(ColumnName = "DEPOTS_ID")] public long? DepotsId { get; set; } /// <summary> /// åå ///</summary> /// åå /// </summary> [SugarColumn(ColumnName = "REASON")] public string? Reason { get; set; } /// <summary> /// å建人 ///</summary> /// å建人 /// </summary> [SugarColumn(ColumnName = "CREATE_BY")] public string? CreateBy { get; set; } /// <summary> /// å建æ¶é´ ///</summary> /// å建æ¶é´ /// </summary> [SugarColumn(ColumnName = "CREATE_DATE")] public DateTime? CreateDate { get; set; } /// <summary> /// æåæ´æ°äºº ///</summary> /// æåæ´æ°äºº /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_BY")] public string? LastupdateBy { get; set; } /// <summary> /// æåæ´æ°æ¶é´ ///</summary> /// æåæ´æ°æ¶é´ /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_DATE")] public DateTime? LastupdateDate { get; set; } /// <summary> /// åæ®ç±»åID ///</summary> /// åæ®ç±»åID /// </summary> [SugarColumn(ColumnName = "BILL_TYPE_ID")] public long? BillTypeId { get; set; } /// <summary> /// äºå¡ç±»åID ///</summary> /// äºå¡ç±»åID /// </summary> [SugarColumn(ColumnName = "TRANSACTION_ID")] public long? TransactionId { get; set; } /// <summary> /// 夿³¨ ///</summary> /// 夿³¨ /// </summary> [SugarColumn(ColumnName = "REMARK")] public string? Remark { get; set; } /// <summary> /// éè´§åå· ///</summary> /// éè´§åå· /// </summary> [SugarColumn(ColumnName = "PAPER_BILL_NO")] public string? PaperBillNo { get; set; } /// <summary> /// éæäººå·¥å· ///</summary> /// éæäººå·¥å· /// </summary> [SugarColumn(ColumnName = "USER_NO_BACK")] public string? UserNoBack { get; set; } /// <summary> /// å®¡æ ¸äºº ///</summary> /// å®¡æ ¸äºº /// </summary> [SugarColumn(ColumnName = "CHECK_USER")] public string? CheckUser { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "CHECK_DATE")] public DateTime? CheckDate { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "TASK_NO")] public string? TaskNo { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "INS_DATE")] public DateTime? InsDate { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "CHECK_RES")] public string? CheckRes { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "CHECK_QTY")] public long? CheckQty { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "MMLIST")] public string? Mmlist { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "EBELN")] public string? Ebeln { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "DEPOTS_CODE")] public string? DepotsCode { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "TRANSCTION_NO")] public string? TransctionNo { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "SUPP_NO")] public string? SuppNo { get; set; } /// <summary> /// ç¶æ | 0-æªå®¡æ ¸ 1-å®¡æ ¸å ¥åº/ç»æ¡ /// é»è®¤å¼: ((0)) ///</summary> /// ç¶æ | 0-æªå®¡æ ¸ 1-å®¡æ ¸å ¥åº/ç»æ¡ /// é»è®¤å¼: ((0)) /// </summary> [SugarColumn(ColumnName = "FSTATUS")] public byte? Fstatus { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "FACTORY")] public string? Factory { get; set; } /// <summary> /// /// é»è®¤å¼: ((0)) ///</summary> /// é»è®¤å¼: ((0)) /// </summary> [SugarColumn(ColumnName = "SAPSTATUS")] public byte? Sapstatus { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "SAPNO")] public string? Sapno { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "SAPYEAR")] public short? Sapyear { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "SAPTEXT")] public string? Saptext { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "ISCHECK")] public byte? Ischeck { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "INSBY")] public string? Insby { get; set; } /// <summary> /// /// é»è®¤å¼: ((0)) ///</summary> /// é»è®¤å¼: ((0)) /// </summary> [SugarColumn(ColumnName = "IS_VISUAL")] public byte? IsVisual { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "COMPANY")] public string? Company { get; set; } /// <summary> /// /// é»è®¤å¼: ((0)) ///</summary> /// é»è®¤å¼: ((0)) /// </summary> [SugarColumn(ColumnName = "URGENT_FLAG")] public byte? UrgentFlag { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "LINE_NO")] public string? LineNo { get; set; } /// <summary> /// å²éäºå¡ç±»åç¼ç ///</summary> /// å²éäºå¡ç±»åç¼ç /// </summary> [SugarColumn(ColumnName = "MTTRANSCTION_NO")] public long? MttransctionNo { get; set; } /// <summary> /// å·¥åè¡å· ///</summary> /// å·¥åè¡å· /// </summary> [SugarColumn(ColumnName = "TASK_LINO")] public string? TaskLino { get; set; } /// <summary> /// ææéç¥ååå· ///</summary> /// ææéç¥ååå· /// </summary> [SugarColumn(ColumnName = "FBILLNO")] public string? Fbillno { get; set; } /// <summary> /// ææåè¡å· ///</summary> /// ææåè¡å· /// </summary> [SugarColumn(ColumnName = "FBILL_LINO")] public string? FbillLino { get; set; } /// <summary> /// 客æ·ç¼å· ///</summary> /// 客æ·ç¼å· /// </summary> [SugarColumn(ColumnName = "CUST_NO")] public string? CustNo { get; set; } /// <summary> /// 客æ·åç§° ///</summary> /// 客æ·åç§° /// </summary> [SugarColumn(ColumnName = "CUST_NAME")] public string? CustName { get; set; } /// <summary> /// IQCæ£éªåå· ///</summary> /// IQCæ£éªåå· /// </summary> [SugarColumn(ColumnName = "IQC_RELEASE_NO")] public string? IqcReleaseNo { get; set; } /// <summary> /// å°è´§åå·/å ¶å®å ¥åºåå· ///</summary> /// å°è´§åå·/å ¶å®å ¥åºåå· /// </summary> [SugarColumn(ColumnName = "CBILL_NO")] public string? CbillNo { get; set; } /// <summary> /// 0 ç³è¯·åï¼1å ¥åºåæ è¯ /// é»è®¤å¼: ((0)) ///</summary> /// 0 ç³è¯·åï¼1å ¥åºåæ è¯ /// é»è®¤å¼: ((0)) /// </summary> [SugarColumn(ColumnName = "PICK_INS")] public byte? PickIns { get; set; } /// <summary> /// å ¥åºå®¡æ ¸äºº ///</summary> /// å ¥åºå®¡æ ¸äºº /// </summary> [SugarColumn(ColumnName = "FCHECK_USER")] public string? FcheckUser { get; set; } /// <summary> /// å ¥åºå®¡æ ¸æ¥æ ///</summary> /// å ¥åºå®¡æ ¸æ¥æ /// </summary> [SugarColumn(ColumnName = "FCHECK_DATE")] public DateTime? FcheckDate { get; set; } /// <summary> /// 任塿±æ¥å/å·¥åå·ï¼æåå ¥åºãéæï¼ ///</summary> /// 任塿±æ¥å/å·¥åå·ï¼æåå ¥åºãéæï¼ /// </summary> [SugarColumn(ColumnName = "RBILL_NO")] public string? RbillNo { get; set; } /// <summary> /// æ¥å·¥äºº ///</summary> /// æ¥å·¥äºº /// </summary> [SugarColumn(ColumnName = "BGR")] public string? Bgr { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "SUPP_ID")] public string? SuppId { get; set; } /// <summary> /// æ¶æç»ç» ///</summary> /// æ¶æç»ç» /// </summary> [SugarColumn(ColumnName = "ReceiveOrgId")] public string? ReceiveOrgId { get; set; } service/Warehouse/MesCgthSqManager.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,145 @@ using System.Data; using System.Data.SqlClient; using Masuit.Tools; using NewPdaSqlServer.DB; using NewPdaSqlServer.Dto.service; using NewPdaSqlServer.entity; using SqlSugar; namespace NewPdaSqlServer.service.Warehouse; public class MesCgthSqManager : Repository<MesCgthSq> { public List<MesCgthSq> GetMesCgthSq() { return Db.Queryable<MesCgthSq>() .Where(s => s.Status == true) .ToList(); } public OutItemDto GetSumItem(WarehouseQuery query) { var mesInvItemOuts = base.GetSingle(it => it.BillNo == query.billNo); if (mesInvItemOuts == null) throw new Exception("éè´éè´§ç³è¯·åä¸åå¨"); var dto = new OutItemDto(); dto.SumItem = GetItems(query); var mesInvItemStocks = Db.Queryable<MesInvItemStocks>() .Where(a => a.ItemBarcode == query.barcode).Single(); if (mesInvItemStocks == null) return dto; var mesItems = Db.Queryable<MesItems>() .Where(s => s.Id == mesInvItemStocks.ItemId).Single(); dto.ItemNo = mesItems.ItemNo; dto.Quantity = mesInvItemStocks.Quantity; return dto; } public List<MesCgthSqDetail> GetItems(WarehouseQuery query) { // å°è¯å°query.id转æ¢ä¸ºGuidç±»åï¼å¦æè½¬æ¢å¤±è´¥ï¼åæåºå¼å¸¸ var parsedGuid = Guid.Empty; if (string.IsNullOrEmpty(query.id)) return new List<MesCgthSqDetail>(); // 妿query.id为空ï¼åè¿å空å表 var isValid = Guid.TryParse(query.id, out parsedGuid); if (!isValid) throw new ApplicationException("GUID转æ¢é误"); // å¦æè½¬æ¢å¤±è´¥ï¼åæåºå¼å¸¸ // 使ç¨SqlSugaræ¡æ¶æ¥è¯¢MesInvItemOutItemsåMesItemsè¡¨ï¼æ ¹æ®ItemIdè¿è¡å è¿æ¥ var mesInvItemOutItemsList = Db.Queryable<MesCgthSqDetail, MesItems>( (c, s) => new object[] { JoinType.Inner, c.ItemId == s.Id // å è¿æ¥æ¡ä»¶ }).Where((c, s) => c.Mid == parsedGuid) // æ ¹æ®ItemOutIdè¿æ»¤ .Select<MesCgthSqDetail>((c, s) => new MesCgthSqDetail // 鿩并æ å°å°MesInvItemOutItems对象 { Id = c.Id, Mid = c.Mid, InvBillNo = c.InvBillNo, InvWorkLine = c.InvWorkLine, Ebeln = c.Ebeln, Eid = c.Eid, Erpid = c.Erpid, SqNum = c.SqNum, YsNum = c.YsNum, RkmxGuid = c.RkmxGuid, Remark = c.Remark, ItemNo = s.ItemNo, // ä»MesItems表ä¸è·åItemNo ItemName = s.ItemName, // ä»MesItems表ä¸è·åItemName ItemModel = s.ItemModel, // ä»MesItems表ä¸è·åItemModel ItemId = c.ItemId, }).ToList(); // å°æ¥è¯¢ç»æè½¬æ¢ä¸ºå表 return mesInvItemOutItemsList; // è¿åå¤çåçå表 } public ProductionPickDto ScanCode(WarehouseQuery query) { var _strMsg = ""; var _intSum = ""; using (var conn = new SqlConnection(DbHelperSQL.strConn)) { if (query.userName.IsNullOrEmpty()) throw new Exception("ç¨æ·åä¸å 许为空"); if (query.billNo.IsNullOrEmpty()) throw new Exception("颿åå·ä¸å 许为空"); if (query.barcode.IsNullOrEmpty()) throw new Exception("æ¡ç ä¸å 许为空"); using (var cmd = new SqlCommand("[prc_pda_CGTH]", conn)) { try { conn.Open(); cmd.CommandType = CommandType.StoredProcedure; SqlParameter[] parameters = { new("@outMsg", SqlDbType.NVarChar, 300), new("@outSum", SqlDbType.NVarChar, 300), new("@barcode_num", SqlDbType.NVarChar, 300), new("@split_num", SqlDbType.NVarChar, 300), new("@c_User", query.userName), new("@p_biLL_no", query.billNo), new("@p_item_barcode", query.barcode) }; parameters[0].Direction = ParameterDirection.Output; parameters[1].Direction = ParameterDirection.Output; parameters[2].Direction = ParameterDirection.Output; parameters[3].Direction = ParameterDirection.Output; foreach (var parameter in parameters) cmd.Parameters.Add(parameter); cmd.ExecuteNonQuery(); _strMsg = parameters[0].Value.ToString(); _intSum = parameters[1].Value.ToString(); var barcodeNum = parameters[2].Value.ToString(); var splitNum = parameters[3].Value.ToString(); var result = Convert.ToInt32(_intSum); if (result <= 0) throw new Exception(_strMsg); var dto = new ProductionPickDto { daa001 = query.daa001, barcodeNum = barcodeNum, splitNum = splitNum, barcode = query.barcode }; return dto; } catch (Exception ex) { throw new Exception(ex.Message); } finally { conn.Close(); } } } } } service/Warehouse/MesInvItemInCDetailsManager.cs
@@ -48,7 +48,7 @@ // && it.EbelnLine == itemBarcodeDetails.WorkLine // && it.Ebeln == itemBarcodeDetails.WorkNo) // .First(); var inventoryDetails = Db.Queryable<MesInvItemArnDetail>() .Where(it => it.Guid == itemBarcodeDetails.AboutGuid) .First(); service/Warehouse/MesInvItemOutsManager.cs
@@ -405,7 +405,7 @@ var dto = new OutItemDto(); dto.SumItem = GetItems(query); //dto.SumItem = GetItems(query); var mesInvItemStocks = Db.Queryable<MesInvItemStocks>() .Where(a => a.ItemBarcode == query.barcode).Single(); service/Warehouse/MesItemTblManager.cs
@@ -8,12 +8,12 @@ namespace NewPdaSqlServer.service.Warehouse; /// <summary> /// MESç©æè¡¨ç®¡çç±» /// MESç©æè¡¨ç®¡çç±» /// </summary> public class MesItemTblManager : Repository<MesItemTbl> { /// <summary> /// è·åç产éæåå·å表 /// è·åç产éæåå·å表 /// </summary> /// <returns>éæåå·å表</returns> public List<string> GetSCTLBillNo(WarehouseQuery query) @@ -28,7 +28,7 @@ } /// <summary> /// æ ¹æ®åå·è·åMESç©æè¡¨æç» /// æ ¹æ®åå·è·åMESç©æè¡¨æç» /// </summary> /// <param name="query">ä»åºæ¥è¯¢åæ°</param> /// <returns>ç©ææç»å表</returns> @@ -65,7 +65,7 @@ } /// <summary> /// çäº§éææ«æåºä½ /// çäº§éææ«æåºä½ /// </summary> /// <param name="query">ä»åºæ¥è¯¢åæ°</param> /// <returns>åºä½ä¿¡æ¯</returns> @@ -92,7 +92,7 @@ } /// <summary> /// çäº§éææ«ææ¡ç /// çäº§éææ«ææ¡ç /// </summary> /// <param name="query">ä»åºæ¥è¯¢åæ°</param> /// <returns>å¤çç»æ</returns> @@ -445,8 +445,9 @@ // æ£æ¥å¿ è¦çæå ¥æä½æ¯å¦é½æåæ§è¡ var minimumExpectedOperations = 3; // è³å°éè¦æ§è¡çæå ¥æä½æ° if (totalResult < minimumExpectedOperations) throw new Exception($"å ³é®æ°æ®æå ¥å¤±è´¥ï¼é¢æè³å°{minimumExpectedOperations}个æä½ï¼å®é æ§è¡{totalResult}个æä½"); if (totalResult < minimumExpectedOperations) throw new Exception( $"å ³é®æ°æ®æå ¥å¤±è´¥ï¼é¢æè³å°{minimumExpectedOperations}个æä½ï¼å®é æ§è¡{totalResult}个æä½"); return totalResult; }); @@ -458,7 +459,7 @@ /// <summary> /// å§å¤éææ«ææ¡ç (ç产éæçé»è¾ï¼åªæ¯è°æ´äºå ä¸ªåæ®µ) /// å§å¤éææ«ææ¡ç (ç产éæçé»è¾ï¼åªæ¯è°æ´äºå ä¸ªåæ®µ) /// </summary> /// <param name="query">ä»åºæ¥è¯¢åæ°</param> /// <returns>å¤çç»æ</returns> @@ -527,7 +528,7 @@ var C_MES_ITEM_TBL = Db.Queryable<MesItemTbl>() .Where(a => a.BillNo == c_mes_inv_item_barcodes.BillNo && (a.Tbl013 ?? 0) == 1).First(); if (C_MES_ITEM_TBL == null) throw new Exception("ç³è¯·åå·²æ¤å,æ æ³æ«ç !"); if (C_MES_ITEM_TBL.Tbl020 == 1) throw new Exception("æ«ç 宿,ç³è¯·åå·²å®ç»!"); @@ -811,8 +812,9 @@ // æ£æ¥å¿ è¦çæå ¥æä½æ¯å¦é½æåæ§è¡ var minimumExpectedOperations = 3; // è³å°éè¦æ§è¡çæå ¥æä½æ° if (totalResult < minimumExpectedOperations) throw new Exception($"å ³é®æ°æ®æå ¥å¤±è´¥ï¼é¢æè³å°{minimumExpectedOperations}个æä½ï¼å®é æ§è¡{totalResult}个æä½"); if (totalResult < minimumExpectedOperations) throw new Exception( $"å ³é®æ°æ®æå ¥å¤±è´¥ï¼é¢æè³å°{minimumExpectedOperations}个æä½ï¼å®é æ§è¡{totalResult}个æä½"); return totalResult; }); service/Warehouse/TransferOutManager.cs
@@ -7,13 +7,13 @@ namespace NewPdaSqlServer.service.Warehouse; /// <summary> /// è°æ¨åºåºç®¡çç±» /// è´è´£å¤çè°æ¨åºåºç¸å ³çä¸å¡é»è¾ /// è°æ¨åºåºç®¡çç±» /// è´è´£å¤çè°æ¨åºåºç¸å ³çä¸å¡é»è¾ /// </summary> public class TransferOutManager : Repository<TransferOut> { /// <summary> /// è·åæªå®æçè°æ¨åºåºåå·å表 /// è·åæªå®æçè°æ¨åºåºåå·å表 /// </summary> /// <returns>æªå®æçè°æ¨åºåºåå·å表</returns> public List<string> GetTransferOutNoList() @@ -28,8 +28,8 @@ .Select(g => new { pid = g.Key, sq = g.Sum(x => x.ShNum), // ç³è¯·æ°éå计 ys = g.Sum(x => x.YsNum) // å·²æ«æ°éå计 sq = g.Sum(x => x.ShNum), // ç³è¯·æ°éå计 ys = g.Sum(x => x.YsNum) // å·²æ«æ°éå计 }) .Where(x => (x.sq ?? 0) != (x.ys ?? 0)) .Select(x => x.pid) @@ -45,7 +45,7 @@ } /// <summary> /// æ ¹æ®åæ®å·è·åå¾ å¤ççè°æ¨åºåºæç»å表 /// æ ¹æ®åæ®å·è·åå¾ å¤ççè°æ¨åºåºæç»å表 /// </summary> /// <param name="query">æ¥è¯¢åæ°,å å«åæ®å·</param> /// <returns>å¾ å¤ççè°æ¨åºåºæç»å表</returns> @@ -62,16 +62,16 @@ JoinType.Left, b.Pid == a.Guid, JoinType.Left, b.ItemId == s.Id)) .Where((b, a, s) => (b.ShNum ?? 0) - (b.YsNum ?? 0) > 0 // æªå®ææ°é大äº0 && a.BillNo == p_bill_no // å¹é åæ®å· && a.Status == 1) // åæ®å·²å®¡æ ¸ (b.ShNum ?? 0) - (b.YsNum ?? 0) > 0 // æªå®ææ°é大äº0 && a.BillNo == p_bill_no // å¹é åæ®å· && a.Status == 1) // åæ®å·²å®¡æ ¸ .OrderBy((b, a, s) => s.ItemNo) .Select((b, a, s) => new TransferOutDetail { ItemNo = s.ItemNo, ItemModel = s.ItemModel, ShNum = b.ShNum, // ç³è¯·æ°é YsNum = b.YsNum, // å·²æ«æ°é ShNum = b.ShNum, // ç³è¯·æ°é YsNum = b.YsNum, // å·²æ«æ°é // ä¿çå ¶ä»å¿ è¦å段... Pid = b.Pid, ItemId = b.ItemId, @@ -83,7 +83,7 @@ } /// <summary> /// æ«ææ¡ç è¿è¡è°æ¨åºåºå¤ç /// æ«ææ¡ç è¿è¡è°æ¨åºåºå¤ç /// </summary> /// <param name="query">å å«åæ®å·ãç¨æ·ååæ¡ç ä¿¡æ¯çæ¥è¯¢åæ°</param> /// <returns>å¤çåç表ååå¾ å¤çæç»å表</returns> @@ -94,23 +94,17 @@ var c_user = query.userName; var p_item_barcode = query.barcode; var p_bill_type_id = 300; // åæ®ç±»åID var p_transaction_no = 301; // 交æç¼å· var p_bill_type_id = 300; // åæ®ç±»åID var p_transaction_no = 301; // 交æç¼å· // éªè¯åæ®å· if (string.IsNullOrEmpty(p_bill_no)) { throw new Exception("请éååæ®å·ï¼"); } if (string.IsNullOrEmpty(p_bill_no)) throw new Exception("请éååæ®å·ï¼"); // æ¥è¯¢åºåºåå¹¶éªè¯ç¶æ var transferOut = Db.Queryable<TransferOut>() .Where(x => x.BillNo == p_bill_no && x.Status == 1) .First(); if (transferOut == null) { throw new Exception("æªæ¾å°è°æ¨ç³è¯·åæè è°æ¨ç³è¯·åæ²¡å®¡æ ¸"); } if (transferOut == null) throw new Exception("æªæ¾å°è°æ¨ç³è¯·åæè è°æ¨ç³è¯·åæ²¡å®¡æ ¸"); // æ¥è¯¢æ¡ç åºåä¿¡æ¯å¹¶éªè¯ var stock = Db.Queryable<MesInvItemStocks>() @@ -118,42 +112,29 @@ && x.Quantity > 0 && !string.IsNullOrEmpty(x.DepotsCode)) .First(); if (stock == null) { throw new Exception($"åºå䏿 æ¤æ¡ç ï¼è¯·æ ¸å¯¹ï¼{p_item_barcode}"); } if (stock == null) throw new Exception($"åºå䏿 æ¤æ¡ç ï¼è¯·æ ¸å¯¹ï¼{p_item_barcode}"); // éªè¯ä»åºä¸è´æ§ if (stock.DepotsCode != transferOut.InvCode) { throw new Exception( $"æ¡ç åºåä»åº{stock.DepotsCode}åç³è¯·ä»åºä¸ä¸è´{transferOut.InvCode}"); } // æ¥è¯¢ç©æä¿¡æ¯ var item = Db.Queryable<MesItems>() .Where(x => x.Id == stock.ItemId) .First(); if (item == null) { throw new Exception("æªæ¾å°ç©æ"); } if (item == null) throw new Exception("æªæ¾å°ç©æ"); // æ¥è¯¢è°æ¨æç»å¹¶éªè¯ var detail = Db.Queryable<TransferOutDetail>() .Where(x => x.ItemId == stock.ItemId && x.Pid == transferOut.Guid) .First(); if (detail == null) { throw new Exception("æªæ¾å°æ¡ç ç©æç¸åºçè°æ¨ç³è¯·"); } if (detail == null) throw new Exception("æªæ¾å°æ¡ç ç©æç¸åºçè°æ¨ç³è¯·"); // éªè¯æ°éæ¯å¦è¶ åºæªæ«æ°é if ((detail.ShNum ?? 0) - (detail.YsNum ?? 0) < stock.Quantity) { throw new Exception("æ¡ç æ°é大äºç³è¯·æªæ«æ°éï¼è¯·æåäºåæ«ç "); } // 使ç¨äºå¡å¤çæ°æ®æ´æ° UseTransaction(db => { @@ -164,7 +145,7 @@ && (x.Status ?? 0) == 0) .First(); var commit = 0; // è®°å½æ´æ°æä½æ¬¡æ° var commit = 0; // è®°å½æ´æ°æä½æ¬¡æ° var c_id = Guid.Empty; // å¤çç§»åºä¸»è¡¨è®°å½ @@ -241,7 +222,7 @@ SuppNo = stock.SuppNo, ItemId = stock.ItemId, EbelnK3id = stock.EbelnK3id, LineK3id = stock.LineK3id, LineK3id = stock.LineK3id // RkDepot = transferOut.RkDepot, // CkDepot = transferOut.CkDepot }; @@ -284,7 +265,7 @@ SuppNo = stock.SuppNo, ItemId = (int)stock.ItemId, EbelnK3id = stock.EbelnK3id, LineK3id = stock.LineK3id, LineK3id = stock.LineK3id // RkDepot = transferOut.RkDepot, // CkDepot = transferOut.CkDepot }; @@ -321,7 +302,7 @@ WorkLine = stock.WorkLine, EbelnK3id = (int)stock.EbelnK3id, LineK3id = (int)stock.LineK3id, Quantity = stock.Quantity, Quantity = stock.Quantity // Unit = stock.ItemUnit }; @@ -342,35 +323,31 @@ .Where(x => x.Guid == detail.Guid) .ExecuteCommand(); } // æ£æ¥æ¯å¦æææç»é½å·²å®æ var totals = db.Queryable<TransferOutDetail, TransferOut>((b, a) => new JoinQueryInfos(JoinType.Left, b.Pid == a.Guid)) var totals = db.Queryable<TransferOutDetail, TransferOut>((b, a) => new JoinQueryInfos(JoinType.Left, b.Pid == a.Guid)) .Where((b, a) => a.BillNo == p_bill_no) .Select((b, a) => new { ShNum = SqlFunc.AggregateSum(b.ShNum), // ç³è¯·æ»æ°é YsNum = SqlFunc.AggregateSum(b.YsNum) // å·²æ«æ»æ°é .Select((b, a) => new { ShNum = SqlFunc.AggregateSum(b.ShNum), // ç³è¯·æ»æ°é YsNum = SqlFunc.AggregateSum(b.YsNum) // å·²æ«æ»æ°é }) .First(); // 妿ç³è¯·æ°éçäºå·²æ«æ°éï¼æ´æ°åæ®å®æç¶æ if (totals.ShNum == totals.YsNum) { commit += db.Updateable<TransferOut>() .SetColumns(x => x.IsWc == 1) .Where(x => x.BillNo == p_bill_no) .ExecuteCommand(); } // æ´æ°è¿ååæ° query.itemNo = item.ItemNo; query.Num = stock.Quantity; // éªè¯æ´æ°æä½æ¯å¦å ¨é¨æå if (commit < 4) { throw new Exception("æ´æ°å¤±è´¥"); } if (commit < 4) throw new Exception("æ´æ°å¤±è´¥"); return commit; });