Controllers/Warehouse/MesItemBlController.cs
@@ -196,17 +196,17 @@ /// <param name="query">æ¥è¯¢åæ°ï¼å¿ é¡»å å«billNo</param> /// <returns>è¡¥æåæç»å表</returns> /// <remarks> /// 请æ±ç¤ºä¾: /// /// 请æ±ç¤ºä¾: /// POST /api/MesItemBl/GetMesItemBlDetailByBillNo /// { /// "billNo": "BL202401010001" /// "billNo": "BL202401010001" /// } /// </remarks> /// <response code="200">æåè·åè¡¥æåæç»</response> /// <response code="400">è·å失败ï¼å¯è½æ¯åæ®å·ä¸å卿已宿</response> [HttpPost("GetMesItemBlDetailByBillNo")] public ResponseResult GetMesItemBlDetailByBillNo([FromBody] WarehouseQuery query) public ResponseResult GetMesItemBlDetailByBillNo( [FromBody] WarehouseQuery query) { try { @@ -231,14 +231,13 @@ /// <param name="query">æ¥è¯¢åæ°</param> /// <returns>æ«æç»æåå¾ å¤çå表</returns> /// <remarks> /// 请æ±ç¤ºä¾: /// /// 请æ±ç¤ºä¾: /// POST /api/MesItemBl/SctlScanBarcode /// { /// "billNo": "WO202401010001", /// "barcode": "1234567890", /// "userName": "admin", /// "blNo": "BL202401010001" /// "billNo": "WO202401010001", /// "barcode": "1234567890", /// "userName": "admin", /// "blNo": "BL202401010001" /// } /// </remarks> /// <response code="200">æ«ææå</response> @@ -301,22 +300,23 @@ /// <param name="query">æ¥è¯¢åæ°ï¼å¿ é¡»å å«billNo</param> /// <returns>è¶ é¢åæç»å表</returns> /// <remarks> /// 请æ±ç¤ºä¾: /// /// 请æ±ç¤ºä¾: /// POST /api/MesItemBl/GetMesItemBlDetailBySccBillNo /// { /// "billNo": "SC202401010001" /// "billNo": "SC202401010001" /// } /// </remarks> /// <response code="200">æåè·åè¶ é¢åæç»</response> /// <response code="400">è·å失败ï¼è¿åå ·ä½é误信æ¯</response> [HttpPost("GetMesItemBlDetailBySccBillNo")] public ResponseResult GetMesItemBlDetailBySccBillNo([FromBody] WarehouseQuery query) public ResponseResult GetMesItemBlDetailBySccBillNo( [FromBody] WarehouseQuery query) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = _manager.GetMesItemBlDetailBySccBillNo(query); resultInfos.tbBillList = _manager.GetMesItemBlDetailBySccBillNo(query); return new ResponseResult { status = 0, @@ -336,25 +336,26 @@ /// <param name="query">æ¥è¯¢åæ°</param> /// <returns>æ«æç»æåå¾ å¤çå表</returns> /// <remarks> /// 请æ±ç¤ºä¾: /// /// 请æ±ç¤ºä¾: /// POST /api/MesItemBl/ScanBarcodeForOverPicking /// { /// "billNo": "WO202401010001", /// "barcode": "1234567890", /// "userName": "admin", /// "blNo": "SC202401010001" /// "billNo": "WO202401010001", /// "barcode": "1234567890", /// "userName": "admin", /// "blNo": "SC202401010001" /// } /// </remarks> /// <response code="200">æ«ææå</response> /// <response code="400">æ«æå¤±è´¥ï¼è¿åå ·ä½é误信æ¯</response> [HttpPost("ScanBarcodeForOverPicking")] public ResponseResult ScanBarcodeForOverPicking([FromBody] WarehouseQuery query) public ResponseResult ScanBarcodeForOverPicking( [FromBody] WarehouseQuery query) { try { dynamic resultInfos = new ExpandoObject(); var (success, pendingList) = _manager.ScanBarcodeForOverPicking(query); var (success, pendingList) = _manager.ScanBarcodeForOverPicking(query); resultInfos.success = success; resultInfos.pendingList = pendingList; return new ResponseResult Controllers/Wom/MesWorkProdCDetailsController.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,163 @@ using System.Dynamic; using Microsoft.AspNetCore.Mvc; using NewPdaSqlServer.entity; using NewPdaSqlServer.service.Wom; using NewPdaSqlServer.util; namespace NewPdaSqlServer.Controllers.Wom; [ApiController] [Route("api/[controller]")] public class MesWorkProdCDetailsController : ControllerBase { private readonly MesWorkProdCDetailsManager m = new(); /***è¿å ¥æ¨¡ç管çå¯ä»¥ä¿®æ¹æ¨¡ç***/ /// <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] MesWorkProdCDetails 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] MesWorkProdCDetails 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] MesWorkProdCDetails 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/Wom/MesWorkProdController.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,162 @@ using System.Dynamic; using Microsoft.AspNetCore.Mvc; using NewPdaSqlServer.entity; using NewPdaSqlServer.service.Wom; using NewPdaSqlServer.util; namespace NewPdaSqlServer.Controllers.Wom; [ApiController] [Route("api/[controller]")] public class MesWorkProdController : ControllerBase { private readonly MesWorkProdManager m = new(); /***è¿å ¥æ¨¡ç管çå¯ä»¥ä¿®æ¹æ¨¡ç***/ /// <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] MesWorkProd 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] MesWorkProd 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] MesWorkProd 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/base/MesStaffController.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,162 @@ using System.Dynamic; using Microsoft.AspNetCore.Mvc; using NewPdaSqlServer.entity; using NewPdaSqlServer.service.@base; using NewPdaSqlServer.util; namespace NewPdaSqlServer.Controllers.@base; [ApiController] [Route("api/[controller]")] public class MesStaffController : ControllerBase { private readonly MesStaffManager m = new(); /***è¿å ¥æ¨¡ç管çå¯ä»¥ä¿®æ¹æ¨¡ç***/ /// <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] MesStaff 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] MesStaff 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] MesStaff 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); } } } Dto/service/ScanWorkRequest.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,10 @@ namespace NewPdaSqlServer.Dto.service; public class ScanWorkRequest { public string? UserNo { get; set; } public string? ItemBarcode { get; set; } public string? StaffNo { get; set; } public decimal? Quantity { get; set; } } Dto/service/ScanWorkResult.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,18 @@ namespace NewPdaSqlServer.Dto.service; /// <summary> /// ç产æ¥å·¥æ«æç»æ /// </summary> public class ScanWorkResult { public string TaskNo { get; set; } public string ItemNo { get; set; } public decimal PlanQty { get; set; } public decimal ReportedQty { get; set; } public decimal CurrentQty { get; set; } public decimal BarcodeQty { get; set; } public string ItemName { get; set; } public string ItemModel { get; set; } public string Message { get; set; } } entity/MesItemBl.cs
@@ -7,149 +7,149 @@ [SugarTable("MES_ITEM_BL")] public class MesItemBl { /// <summary> /// ID /// </summary> [SugarColumn(ColumnName = "id", IsPrimaryKey = true)] /// <summary> /// ID /// </summary> [SugarColumn(ColumnName = "id", IsPrimaryKey = true)] public Guid Id { get; set; } /// <summary> /// è¡¥æåå· /// </summary> [SugarColumn(ColumnName = "bl_no")] /// <summary> /// è¡¥æåå· /// </summary> [SugarColumn(ColumnName = "bl_no")] public string BlNo { get; set; } /// <summary> /// ç产工å /// </summary> [SugarColumn(ColumnName = "bl001")] /// <summary> /// ç产工å /// </summary> [SugarColumn(ColumnName = "bl001")] public string Bl001 { get; set; } /// <summary> /// 产åç¼å· /// </summary> [SugarColumn(ColumnName = "bl002")] /// <summary> /// 产åç¼å· /// </summary> [SugarColumn(ColumnName = "bl002")] public string Bl002 { get; set; } /// <summary> /// 产é /// </summary> [SugarColumn(ColumnName = "bl003")] /// <summary> /// 产é /// </summary> [SugarColumn(ColumnName = "bl003")] public int? Bl003 { get; set; } /// <summary> /// ç³è¯·äºº /// </summary> [SugarColumn(ColumnName = "bl004")] /// <summary> /// ç³è¯·äºº /// </summary> [SugarColumn(ColumnName = "bl004")] public string Bl004 { get; set; } /// <summary> /// é¢ææ¥æ /// </summary> [SugarColumn(ColumnName = "bl005")] /// <summary> /// é¢ææ¥æ /// </summary> [SugarColumn(ColumnName = "bl005")] public DateTime? Bl005 { get; set; } /// <summary> /// å®¡æ ¸æ¥æ /// </summary> [SugarColumn(ColumnName = "bl006")] /// <summary> /// å®¡æ ¸æ¥æ /// </summary> [SugarColumn(ColumnName = "bl006")] public DateTime? Bl006 { get; set; } /// <summary> /// è¡¥æåå /// </summary> [SugarColumn(ColumnName = "bl007")] /// <summary> /// è¡¥æåå /// </summary> [SugarColumn(ColumnName = "bl007")] public string Bl007 { get; set; } /// <summary> /// åºåºç±»å«ï¼è¡¥æ,è¶ é¢ï¼ /// </summary> [SugarColumn(ColumnName = "bl008")] /// <summary> /// åºåºç±»å«ï¼è¡¥æ,è¶ é¢ï¼ /// </summary> [SugarColumn(ColumnName = "bl008")] public string Bl008 { get; set; } /// <summary> /// ä¸å¡ç±»å /// </summary> [SugarColumn(ColumnName = "bl009")] /// <summary> /// ä¸å¡ç±»å /// </summary> [SugarColumn(ColumnName = "bl009")] public string Bl009 { get; set; } /// <summary> /// åæä» /// </summary> [SugarColumn(ColumnName = "bl010")] /// <summary> /// åæä» /// </summary> [SugarColumn(ColumnName = "bl010")] public string Bl010 { get; set; } /// <summary> /// è¡¥æé¨é¨ /// </summary> [SugarColumn(ColumnName = "bl011")] /// <summary> /// è¡¥æé¨é¨ /// </summary> [SugarColumn(ColumnName = "bl011")] public string Bl011 { get; set; } /// <summary> /// è¡¥æäº§çº¿ /// </summary> [SugarColumn(ColumnName = "bl012")] /// <summary> /// è¡¥æäº§çº¿ /// </summary> [SugarColumn(ColumnName = "bl012")] public string Bl012 { get; set; } /// <summary> /// ä»»å¡åå· /// </summary> [SugarColumn(ColumnName = "bl013")] /// <summary> /// ä»»å¡åå· /// </summary> [SugarColumn(ColumnName = "bl013")] public string Bl013 { get; set; } /// <summary> /// 产ååç§° /// </summary> [SugarColumn(ColumnName = "bl014")] /// <summary> /// 产ååç§° /// </summary> [SugarColumn(ColumnName = "bl014")] public string Bl014 { get; set; } /// <summary> /// 产ååå· /// </summary> [SugarColumn(ColumnName = "bl015")] /// <summary> /// 产ååå· /// </summary> [SugarColumn(ColumnName = "bl015")] public string Bl015 { get; set; } /// <summary> /// å®¡æ ¸äºº /// </summary> [SugarColumn(ColumnName = "bl016")] /// <summary> /// å®¡æ ¸äºº /// </summary> [SugarColumn(ColumnName = "bl016")] public string Bl016 { get; set; } /// <summary> /// ä¸å¡ç±»åç¼ç /// </summary> [SugarColumn(ColumnName = "bl017")] /// <summary> /// ä¸å¡ç±»åç¼ç /// </summary> [SugarColumn(ColumnName = "bl017")] public string Bl017 { get; set; } /// <summary> /// å®¡æ ¸ç¶æ /// é»è®¤å¼: ((0)) /// </summary> [SugarColumn(ColumnName = "bl018")] /// <summary> /// å®¡æ ¸ç¶æ /// é»è®¤å¼: ((0)) /// </summary> [SugarColumn(ColumnName = "bl018")] public bool? Bl018 { get; set; } /// <summary> /// å®ç»æ è¯ /// é»è®¤å¼: ((0)) /// </summary> [SugarColumn(ColumnName = "bl019")] /// <summary> /// å®ç»æ è¯ /// é»è®¤å¼: ((0)) /// </summary> [SugarColumn(ColumnName = "bl019")] public bool? Bl019 { get; set; } /// <summary> /// 产åid /// </summary> [SugarColumn(ColumnName = "item_id")] /// <summary> /// 产åid /// </summary> [SugarColumn(ColumnName = "item_id")] public int? ItemId { get; set; } /// <summary> /// å®æäºº /// </summary> [SugarColumn(ColumnName = "wc_user")] /// <summary> /// å®æäºº /// </summary> [SugarColumn(ColumnName = "wc_user")] public string WcUser { get; set; } /// <summary> /// 宿æ¶é´ /// </summary> [SugarColumn(ColumnName = "wc_time")] /// <summary> /// 宿æ¶é´ /// </summary> [SugarColumn(ColumnName = "wc_time")] public string WcTime { get; set; } } entity/MesItemBlDetail.cs
@@ -7,137 +7,137 @@ [SugarTable("MES_ITEM_BL_DETAIL")] public class MesItemBlDetail { /// <summary> /// ID /// </summary> [SugarColumn(ColumnName = "id", IsPrimaryKey = true)] /// <summary> /// ID /// </summary> [SugarColumn(ColumnName = "id", IsPrimaryKey = true)] public Guid Id { get; set; } /// <summary> /// MID /// </summary> [SugarColumn(ColumnName = "mid")] /// <summary> /// MID /// </summary> [SugarColumn(ColumnName = "mid")] public Guid? Mid { get; set; } /// <summary> /// å·¥åå· /// </summary> [SugarColumn(ColumnName = "bld001")] /// <summary> /// å·¥åå· /// </summary> [SugarColumn(ColumnName = "bld001")] public string Bld001 { get; set; } /// <summary> /// ç©æç¼å· /// </summary> [SugarColumn(ColumnName = "bld002")] /// <summary> /// ç©æç¼å· /// </summary> [SugarColumn(ColumnName = "bld002")] public string Bld002 { get; set; } /// <summary> /// ç©æåç§° /// </summary> [SugarColumn(ColumnName = "bld003")] /// <summary> /// ç©æåç§° /// </summary> [SugarColumn(ColumnName = "bld003")] public string Bld003 { get; set; } /// <summary> /// è§æ ¼åå· /// </summary> [SugarColumn(ColumnName = "bld004")] /// <summary> /// è§æ ¼åå· /// </summary> [SugarColumn(ColumnName = "bld004")] public string Bld004 { get; set; } /// <summary> /// é¢è² /// </summary> [SugarColumn(ColumnName = "bld005")] /// <summary> /// é¢è² /// </summary> [SugarColumn(ColumnName = "bld005")] public string Bld005 { get; set; } /// <summary> /// è®¡åæ°é /// </summary> [SugarColumn(ColumnName = "bld006")] /// <summary> /// è®¡åæ°é /// </summary> [SugarColumn(ColumnName = "bld006")] public int? Bld006 { get; set; } /// <summary> /// ç³è¯·æ°é /// </summary> [SugarColumn(ColumnName = "bld007")] /// <summary> /// ç³è¯·æ°é /// </summary> [SugarColumn(ColumnName = "bld007")] public int? Bld007 { get; set; } /// <summary> /// 已颿°é /// é»è®¤å¼: ((0)) /// </summary> [SugarColumn(ColumnName = "bld008")] /// <summary> /// 已颿°é /// é»è®¤å¼: ((0)) /// </summary> [SugarColumn(ColumnName = "bld008")] public int? Bld008 { get; set; } /// <summary> /// åä½ /// </summary> [SugarColumn(ColumnName = "bld009")] /// <summary> /// åä½ /// </summary> [SugarColumn(ColumnName = "bld009")] public string Bld009 { get; set; } /// <summary> /// 夿³¨ /// </summary> [SugarColumn(ColumnName = "bld010")] /// <summary> /// 夿³¨ /// </summary> [SugarColumn(ColumnName = "bld010")] public string Bld010 { get; set; } /// <summary> /// å®ç»æ è¯ /// é»è®¤å¼: ((0)) /// </summary> [SugarColumn(ColumnName = "bld011")] /// <summary> /// å®ç»æ è¯ /// é»è®¤å¼: ((0)) /// </summary> [SugarColumn(ColumnName = "bld011")] public int? Bld011 { get; set; } /// <summary> /// ç©æid /// </summary> [SugarColumn(ColumnName = "bld012")] /// <summary> /// ç©æid /// </summary> [SugarColumn(ColumnName = "bld012")] public int? Bld012 { get; set; } /// <summary> /// 项次 /// </summary> [SugarColumn(ColumnName = "bld013")] /// <summary> /// 项次 /// </summary> [SugarColumn(ColumnName = "bld013")] public int? Bld013 { get; set; } /// <summary> /// ERPææåè¡id /// </summary> [SugarColumn(ColumnName = "bld014")] /// <summary> /// ERPææåè¡id /// </summary> [SugarColumn(ColumnName = "bld014")] public int? Bld014 { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "bld015")] /// <summary> /// </summary> [SugarColumn(ColumnName = "bld015")] public string Bld015 { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "bld016")] /// <summary> /// </summary> [SugarColumn(ColumnName = "bld016")] public string Bld016 { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "bld017")] /// <summary> /// </summary> [SugarColumn(ColumnName = "bld017")] public string Bld017 { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "bld018")] /// <summary> /// </summary> [SugarColumn(ColumnName = "bld018")] public string Bld018 { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "bld019")] /// <summary> /// </summary> [SugarColumn(ColumnName = "bld019")] public string Bld019 { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "bld020")] /// <summary> /// </summary> [SugarColumn(ColumnName = "bld020")] public string Bld020 { get; set; } /// <summary> /// å ³èçdabè¡¨ä¸»é® /// </summary> [SugarColumn(ColumnName = "dabGuid")] /// <summary> /// å ³èçdabè¡¨ä¸»é® /// </summary> [SugarColumn(ColumnName = "dabGuid")] public Guid? DabGuid { get; set; } } entity/MesWorkProd.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,118 @@ using SqlSugar; namespace NewPdaSqlServer.entity; /// <summary> /// æ¥å·¥ä¸»è¡¨ /// </summary> [SugarTable("MES_WORK_PROD")] public class MesWorkProd { /// <summary> /// å¯ä¸æ è¯ç¬¦ /// é»è®¤å¼: (newid()) /// </summary> [SugarColumn(ColumnName = "id", IsPrimaryKey = true)] public Guid Id { get; set; } /// <summary> /// æ¥å·¥åå· /// </summary> [SugarColumn(ColumnName = "bill_no")] public string BillNo { get; set; } /// <summary> /// ç产线 /// </summary> [SugarColumn(ColumnName = "line_no")] public string LineNo { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "company")] public string Company { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "factory")] public string Factory { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "create_by")] public string CreateBy { get; set; } /// <summary> /// åå»ºæ¥æ /// é»è®¤å¼: (getdate()) /// </summary> [SugarColumn(ColumnName = "create_date")] public DateTime? CreateDate { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "lastupdate_by")] public string LastupdateBy { get; set; } /// <summary> /// é»è®¤å¼: (getdate()) /// </summary> [SugarColumn(ColumnName = "lastupdate_date")] public DateTime? LastupdateDate { get; set; } /// <summary> /// çæ¬¡ /// </summary> [SugarColumn(ColumnName = "class_no")] public string ClassNo { 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 int? Status { get; set; } /// <summary> /// 派工åå· /// </summary> [SugarColumn(ColumnName = "pbill_no")] public string PbillNo { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "bill_type_id")] public decimal? BillTypeId { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "transaction_no")] public decimal? TransactionNo { get; set; } /// <summary> /// ä»»å¡åå· /// </summary> [SugarColumn(ColumnName = "task_no")] public string TaskNo { get; set; } /// <summary> /// 塿¿æ°é /// </summary> [SugarColumn(ColumnName = "kb_qty")] public decimal? KbQty { get; set; } /// <summary> /// æ¯ç®±æ°é /// </summary> [SugarColumn(ColumnName = "box_qty")] public decimal? BoxQty { get; set; } } entity/MesWorkProdCDetails.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,106 @@ using SqlSugar; namespace NewPdaSqlServer.entity; /// <summary> /// æ¥å·¥æ¡ç 表 /// </summary> [SugarTable("MES_WORK_PROD_C_DETAILS")] public class MesWorkProdCDetails { /// <summary> /// å¯ä¸æ è¯ç¬¦ /// é»è®¤å¼: (newid()) /// </summary> [SugarColumn(ColumnName = "id", IsPrimaryKey = true)] public Guid Id { get; set; } /// <summary> /// æ¥å·¥åå· /// </summary> [SugarColumn(ColumnName = "bill_no")] public string BillNo { get; set; } /// <summary> /// æ¥å·¥æ¡ç /// </summary> [SugarColumn(ColumnName = "item_barcode")] public string ItemBarcode { get; set; } /// <summary> /// æ°é /// </summary> [SugarColumn(ColumnName = "quantity")] public int? Quantity { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "company")] public string Company { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "factory")] public string Factory { 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 = "lastupdate_by")] public string LastupdateBy { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "lastupdate_date")] public DateTime? LastupdateDate { get; set; } /// <summary> /// ç©æç¼å· /// </summary> [SugarColumn(ColumnName = "item_no")] public string ItemNo { get; set; } /// <summary> /// 派工åå· /// </summary> [SugarColumn(ColumnName = "pbill_no")] public string PbillNo { get; set; } /// <summary> /// æåå·¥åº /// </summary> [SugarColumn(ColumnName = "work_last")] public decimal? WorkLast { get; set; } /// <summary> /// ä¸å°æ¬¡æ° /// </summary> [SugarColumn(ColumnName = "silk_pqty")] public decimal? SilkPqty { get; set; } /// <summary> /// 派工ä»è¡¨ID /// </summary> [SugarColumn(ColumnName = "silk_id")] public decimal? SilkId { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "silk")] public string Silk { get; set; } /// <summary> /// æ¥å·¥åå·¥ /// </summary> [SugarColumn(ColumnName = "bg_yg")] public decimal? BgYg { get; set; } } entity/Womdaa.cs
@@ -8,418 +8,415 @@ public class Womdaa { /// <summary> /// /// é»è®¤å¼: (newid()) ///</summary> /// é»è®¤å¼: (newid()) /// </summary> [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)] public Guid Guid { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "pbaGuid")] public Guid? PbaGuid { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "caaGuid")] public Guid? CaaGuid { get; set; } /// <summary> /// èªå¢å ///</summary> /// èªå¢å /// </summary> [SugarColumn(ColumnName = "id")] public int? Id { get; set; } /// <summary> /// æäº§ID ///</summary> /// æäº§ID /// </summary> [SugarColumn(ColumnName = "pid")] public int? Pid { get; set; } /// <summary> /// åå· ///</summary> /// åå· /// </summary> [SugarColumn(ColumnName = "daa001")] public string? Daa001 { get; set; } /// <summary> /// 产åID ///</summary> /// 产åID /// </summary> [SugarColumn(ColumnName = "daa002")] public string? Daa002 { get; set; } /// <summary> /// 产ååç§° ///</summary> /// 产ååç§° /// </summary> [SugarColumn(ColumnName = "daa003")] public string? Daa003 { get; set; } /// <summary> /// 产åè§æ ¼ ///</summary> /// 产åè§æ ¼ /// </summary> [SugarColumn(ColumnName = "daa004")] public string? Daa004 { get; set; } /// <summary> /// åä½ ///</summary> /// åä½ /// </summary> [SugarColumn(ColumnName = "daa005")] public string? Daa005 { get; set; } /// <summary> /// ERPé¢è®¡å¼å·¥æ¶é´ ///</summary> /// ERPé¢è®¡å¼å·¥æ¶é´ /// </summary> [SugarColumn(ColumnName = "daa006")] public DateTime? Daa006 { get; set; } /// <summary> /// ERPé¢è®¡å®å·¥æ¶é´ ///</summary> /// ERPé¢è®¡å®å·¥æ¶é´ /// </summary> [SugarColumn(ColumnName = "daa007")] public DateTime? Daa007 { get; set; } /// <summary> /// 工忰é ///</summary> /// 工忰é /// </summary> [SugarColumn(ColumnName = "daa008")] public int? Daa008 { get; set; } /// <summary> /// 夿³¨ ///</summary> /// 夿³¨ /// </summary> [SugarColumn(ColumnName = "daa009")] public string? Daa009 { get; set; } /// <summary> /// å ¥åºæ°é ///</summary> /// å ¥åºæ°é /// </summary> [SugarColumn(ColumnName = "daa010")] public int? Daa010 { get; set; } /// <summary> /// å·²ç产é ///</summary> /// å·²ç产é /// </summary> [SugarColumn(ColumnName = "daa011")] public int? Daa011 { get; set; } /// <summary> /// æ¥åºæ°é ///</summary> /// æ¥åºæ°é /// </summary> [SugarColumn(ColumnName = "daa012")] public int? Daa012 { get; set; } /// <summary> /// å·¥ä½è½¦é´ ///</summary> /// å·¥ä½è½¦é´ /// </summary> [SugarColumn(ColumnName = "daa013")] public string? Daa013 { get; set; } /// <summary> /// ææååå· ///</summary> /// ææååå· /// </summary> [SugarColumn(ColumnName = "daa014")] public string? Daa014 { get; set; } /// <summary> /// çäº§çº¿å« ///</summary> /// çäº§çº¿å« /// </summary> [SugarColumn(ColumnName = "daa015")] public string? Daa015 { get; set; } /// <summary> /// å®é å¼å·¥æ¥ ///</summary> /// å®é å¼å·¥æ¥ /// </summary> [SugarColumn(ColumnName = "daa016")] public DateTime? Daa016 { get; set; } /// <summary> /// å®é å®å·¥æ¥ ///</summary> /// å®é å®å·¥æ¥ /// </summary> [SugarColumn(ColumnName = "daa017")] public DateTime? Daa017 { get; set; } /// <summary> /// å·¥åç¶æ ///</summary> /// å·¥åç¶æ /// </summary> [SugarColumn(ColumnName = "daa018")] public string? Daa018 { get; set; } /// <summary> /// é½å¥ç¶æ ///</summary> /// é½å¥ç¶æ /// </summary> [SugarColumn(ColumnName = "daa019")] public string? Daa019 { get; set; } /// <summary> /// å®¡æ ¸ç ///</summary> /// å®¡æ ¸ç /// </summary> [SugarColumn(ColumnName = "fstatus")] public int? Fstatus { get; set; } /// <summary> /// å®¡æ ¸æ¥æ ///</summary> /// å®¡æ ¸æ¥æ /// </summary> [SugarColumn(ColumnName = "check_date")] public DateTime? CheckDate { get; set; } /// <summary> /// å®¡æ ¸äºº ///</summary> /// å®¡æ ¸äºº /// </summary> [SugarColumn(ColumnName = "check_user")] public string? CheckUser { get; set; } /// <summary> /// 线å«ç¼ç ///</summary> /// 线å«ç¼ç /// </summary> [SugarColumn(ColumnName = "daa020")] public string? Daa020 { get; set; } /// <summary> /// ä»»å¡ååå· ///</summary> /// ä»»å¡ååå· /// </summary> [SugarColumn(ColumnName = "daa021")] public string? Daa021 { get; set; } /// <summary> /// éç¥å¤æï¼0-æªéç¥ï¼1-éç¥ /// é»è®¤å¼: ((0)) ///</summary> /// éç¥å¤æï¼0-æªéç¥ï¼1-éç¥ /// é»è®¤å¼: ((0)) /// </summary> [SugarColumn(ColumnName = "daa022")] public int? Daa022 { get; set; } /// <summary> /// ç产åºå· ///</summary> /// ç产åºå· /// </summary> [SugarColumn(ColumnName = "daa023")] public int? Daa023 { get; set; } /// <summary> /// æäº§æ¥æ ///</summary> /// æäº§æ¥æ /// </summary> [SugarColumn(ColumnName = "daa024")] public string? Daa024 { get; set; } /// <summary> /// é¦ä»¶æ¯å¦æ£éª1-æ£éªï¼0æªæ£éª ///</summary> /// é¦ä»¶æ¯å¦æ£éª1-æ£éªï¼0æªæ£éª /// </summary> [SugarColumn(ColumnName = "daa025")] public string? Daa025 { get; set; } /// <summary> /// é¦ä»¶æ£éªç»æ ///</summary> /// é¦ä»¶æ£éªç»æ /// </summary> [SugarColumn(ColumnName = "daa026")] public string? Daa026 { get; set; } /// <summary> /// å·²æ¥æ£ï¼0-æªæ¥æ£ï¼1-å·²æ¥æ£ ///</summary> /// å·²æ¥æ£ï¼0-æªæ¥æ£ï¼1-å·²æ¥æ£ /// </summary> [SugarColumn(ColumnName = "is_reportcheck")] public int? IsReportcheck { get; set; } /// <summary> /// æ¥æ£äºº ///</summary> /// æ¥æ£äºº /// </summary> [SugarColumn(ColumnName = "usname")] public string? Usname { get; set; } /// <summary> /// æ¥æ£æ¶é´ ///</summary> /// æ¥æ£æ¶é´ /// </summary> [SugarColumn(ColumnName = "reporttime")] public DateTime? Reporttime { get; set; } /// <summary> /// æºå°ç¼å· ///</summary> /// æºå°ç¼å· /// </summary> [SugarColumn(ColumnName = "machine_no")] public string? MachineNo { get; set; } /// <summary> /// 夿宿1-宿ï¼0æªå®æ ///</summary> /// 夿宿1-宿ï¼0æªå®æ /// </summary> [SugarColumn(ColumnName = "daa027")] public int? Daa027 { get; set; } /// <summary> /// 夿宿æ¶é´ ///</summary> /// 夿宿æ¶é´ /// </summary> [SugarColumn(ColumnName = "daa028")] public string? Daa028 { get; set; } /// <summary> /// æ åå·¥æ¶ ///</summary> /// æ åå·¥æ¶ /// </summary> [SugarColumn(ColumnName = "prod_hour")] public int? ProdHour { get; set; } /// <summary> /// åäººå°æ¶äº§è½ ///</summary> /// åäººå°æ¶äº§è½ /// </summary> [SugarColumn(ColumnName = "person_hour_capacity")] public int? PersonHourCapacity { get; set; } /// <summary> /// ç论æ 产 ///</summary> /// ç论æ 产 /// </summary> [SugarColumn(ColumnName = "the_capacity")] public int? TheCapacity { get; set; } /// <summary> /// 计åç¨äººæ° ///</summary> /// 计åç¨äººæ° /// </summary> [SugarColumn(ColumnName = "plan_personnel")] public int? PlanPersonnel { get; set; } /// <summary> /// è®¡åæ åäº§è½ ///</summary> /// è®¡åæ åäº§è½ /// </summary> [SugarColumn(ColumnName = "plan_capacity")] public int? PlanCapacity { get; set; } /// <summary> /// çè®ºç¨æ¶/M ///</summary> /// çè®ºç¨æ¶/M /// </summary> [SugarColumn(ColumnName = "the_min")] public int? TheMin { get; set; } /// <summary> /// çè®ºç¨æ¶/H ///</summary> /// çè®ºç¨æ¶/H /// </summary> [SugarColumn(ColumnName = "the_hour")] public int? TheHour { get; set; } /// <summary> /// 线ä½ç±»å« ///</summary> /// 线ä½ç±»å« /// </summary> [SugarColumn(ColumnName = "line_type")] public string? LineType { get; set; } /// <summary> /// æ åäººæ° ///</summary> /// æ åäººæ° /// </summary> [SugarColumn(ColumnName = "personnel")] public int? Personnel { get; set; } /// <summary> /// æ¢çº¿æ¶é´ ///</summary> /// æ¢çº¿æ¶é´ /// </summary> [SugarColumn(ColumnName = "change_line_time")] public int? ChangeLineTime { get; set; } /// <summary> /// 伿¯æ¶é´ ///</summary> /// 伿¯æ¶é´ /// </summary> [SugarColumn(ColumnName = "rest_time")] public int? RestTime { get; set; } /// <summary> /// æäº§åºå· ///</summary> /// æäº§åºå· /// </summary> [SugarColumn(ColumnName = "schedule_order")] public int? ScheduleOrder { get; set; } /// <summary> /// MESé¢è®¡å¼å·¥æ¶é´ ///</summary> /// MESé¢è®¡å¼å·¥æ¶é´ /// </summary> [SugarColumn(ColumnName = "mes_start_prod")] public DateTime? MesStartProd { get; set; } /// <summary> /// MESé¢è®¡å®å·¥æ¶é´ ///</summary> /// MESé¢è®¡å®å·¥æ¶é´ /// </summary> [SugarColumn(ColumnName = "mes_end_prod")] public DateTime? MesEndProd { get; set; } /// <summary> /// æäº§æ¨éæ è¯ ///</summary> /// æäº§æ¨éæ è¯ /// </summary> [SugarColumn(ColumnName = "prodts")] public int? Prodts { get; set; } /// <summary> /// é¢è®¡å¤ææ¶é´ ///</summary> /// é¢è®¡å¤ææ¶é´ /// </summary> [SugarColumn(ColumnName = "prepare_time")] public DateTime? PrepareTime { get; set; } /// <summary> /// æä»¶æå ¥äººæ° ///</summary> /// æä»¶æå ¥äººæ° /// </summary> [SugarColumn(ColumnName = "cj_worker")] public int? CjWorker { get; set; } /// <summary> /// æä»¶è®¡åæå ¥äººæ° ///</summary> /// æä»¶è®¡åæå ¥äººæ° /// </summary> [SugarColumn(ColumnName = "p_cj_worker")] public int? PCjWorker { get; set; } /// <summary> /// æä»¶æ¥äº§é ///</summary> /// æä»¶æ¥äº§é /// </summary> [SugarColumn(ColumnName = "cj_daily_out")] public int? CjDailyOut { get; set; } /// <summary> /// æä»¶æ åå·¥æ¶ ///</summary> /// æä»¶æ åå·¥æ¶ /// </summary> [SugarColumn(ColumnName = "cj_std_hour")] public int? CjStdHour { get; set; } /// <summary> /// é¡çæå ¥äººæ° ///</summary> /// é¡çæå ¥äººæ° /// </summary> [SugarColumn(ColumnName = "hx_worker")] public int? HxWorker { get; set; } /// <summary> /// é¡ç计åæå ¥äººæ° ///</summary> /// é¡ç计åæå ¥äººæ° /// </summary> [SugarColumn(ColumnName = "p_hx_worker")] public int? PHxWorker { get; set; } /// <summary> /// é¡çæ¥äº§é ///</summary> /// é¡çæ¥äº§é /// </summary> [SugarColumn(ColumnName = "hx_daily_out")] public int? HxDailyOut { get; set; } /// <summary> /// é¡çæ åå·¥æ¶ ///</summary> /// é¡çæ åå·¥æ¶ /// </summary> [SugarColumn(ColumnName = "hx_std_hour")] public int? HxStdHour { get; set; } /// <summary> /// æä»¶æ°é ///</summary> /// æä»¶æ°é /// </summary> [SugarColumn(ColumnName = "cj_num")] public int? CjNum { get; set; } /// <summary> /// å®¢æ· ///</summary> /// å®¢æ· /// </summary> [SugarColumn(ColumnName = "cust")] public string? Cust { get; set; } /// <summary> /// æ¯å¦é¦æ£ ///</summary> /// æ¯å¦é¦æ£ /// </summary> [SugarColumn(ColumnName = "IS_SJ")] public int? IsSj { get; set; } /// <summary> /// 产åç¼ç ///</summary> /// 产åç¼ç /// </summary> [SugarColumn(ColumnName = "daa029")] public string? Daa029 { get; set; } /// <summary> /// å®é 线ä½ç¼ç ///</summary> /// å®é 线ä½ç¼ç /// </summary> [SugarColumn(ColumnName = "sj_xt")] public string? SjXt { get; set; } } entity/Womdab.cs
@@ -8,233 +8,231 @@ public class Womdab { /// <summary> /// /// é»è®¤å¼: (newid()) ///</summary> /// é»è®¤å¼: (newid()) /// </summary> [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)] public Guid Guid { get; set; } /// <summary> /// ///</summary> /// </summary> [SugarColumn(ColumnName = "daaGuid")] public Guid? DaaGuid { get; set; } /// <summary> /// èªå¢å ///</summary> /// èªå¢å /// </summary> [SugarColumn(ColumnName = "id")] public int? Id { get; set; } /// <summary> /// PID ///</summary> /// PID /// </summary> [SugarColumn(ColumnName = "pid")] public int? Pid { get; set; } /// <summary> /// å·¥ååå· ///</summary> /// å·¥ååå· /// </summary> [SugarColumn(ColumnName = "dab001")] public string? Dab001 { get; set; } /// <summary> /// åºå· ///</summary> /// åºå· /// </summary> [SugarColumn(ColumnName = "dab002")] public int? Dab002 { get; set; } /// <summary> /// ææid ///</summary> /// ææid /// </summary> [SugarColumn(ColumnName = "dab003")] public string? Dab003 { get; set; } /// <summary> /// ææåç§° ///</summary> /// ææåç§° /// </summary> [SugarColumn(ColumnName = "dab004")] public string? Dab004 { get; set; } /// <summary> /// ææè§æ ¼ ///</summary> /// ææè§æ ¼ /// </summary> [SugarColumn(ColumnName = "dab005")] public string? Dab005 { get; set; } /// <summary> /// éé¢ç¨é ///</summary> /// éé¢ç¨é /// </summary> [SugarColumn(ColumnName = "dab006")] public decimal? Dab006 { get; set; } /// <summary> /// å·²é¢ç¨é ///</summary> /// å·²é¢ç¨é /// </summary> [SugarColumn(ColumnName = "dab007")] public decimal? Dab007 { get; set; } /// <summary> /// å·¥èº ///</summary> /// å·¥èº /// </summary> [SugarColumn(ColumnName = "dab008")] public string? Dab008 { get; set; } /// <summary> /// åä½ ///</summary> /// åä½ /// </summary> [SugarColumn(ColumnName = "dab009")] public string? Dab009 { get; set; } /// <summary> /// ææç±»å ///</summary> /// ææç±»å /// </summary> [SugarColumn(ColumnName = "dab010")] public string? Dab010 { get; set; } /// <summary> /// 主æ ///</summary> /// 主æ /// </summary> [SugarColumn(ColumnName = "dab011")] public string? Dab011 { get; set; } /// <summary> /// ç»æç¨é ///</summary> /// ç»æç¨é /// </summary> [SugarColumn(ColumnName = "dab012")] public int? Dab012 { get; set; } /// <summary> /// åºæ° ///</summary> /// åºæ° /// </summary> [SugarColumn(ColumnName = "dab013")] public int? Dab013 { get; set; } /// <summary> /// æ¯å¦æ¿æ ///</summary> /// æ¯å¦æ¿æ /// </summary> [SugarColumn(ColumnName = "dab014")] public string? Dab014 { get; set; } /// <summary> /// ç¹ä½ ///</summary> /// ç¹ä½ /// </summary> [SugarColumn(ColumnName = "dab015")] public string? Dab015 { get; set; } /// <summary> /// ææåå· ///</summary> /// ææåå· /// </summary> [SugarColumn(ColumnName = "dab016")] public string? Dab016 { get; set; } /// <summary> /// ä»åºç¼ç ///</summary> /// ä»åºç¼ç /// </summary> [SugarColumn(ColumnName = "dab017")] public string? Dab017 { get; set; } /// <summary> /// ä»åºåç§° ///</summary> /// ä»åºåç§° /// </summary> [SugarColumn(ColumnName = "dab018")] public string? Dab018 { get; set; } /// <summary> /// 颿æ¹å¼ ///</summary> /// 颿æ¹å¼ /// </summary> [SugarColumn(ColumnName = "dab019")] public string? Dab019 { get; set; } /// <summary> /// åºå®æè ///</summary> /// åºå®æè /// </summary> [SugarColumn(ColumnName = "scrapqty")] public int? Scrapqty { get; set; } /// <summary> /// å卿èç ///</summary> /// å卿èç /// </summary> [SugarColumn(ColumnName = "scraprate")] public int? Scraprate { get; set; } /// <summary> /// ææåè¡id ///</summary> /// ææåè¡id /// </summary> [SugarColumn(ColumnName = "erpid")] public int? Erpid { get; set; } /// <summary> /// ææå头id ///</summary> /// ææå头id /// </summary> [SugarColumn(ColumnName = "eid")] public int? Eid { get; set; } /// <summary> /// å®é¢ç¨é /// é»è®¤å¼: ((0)) ///</summary> /// å®é¢ç¨é /// é»è®¤å¼: ((0)) /// </summary> [SugarColumn(ColumnName = "dab020")] public decimal? Dab020 { get; set; } /// <summary> /// è¡¥é¢æ°é /// é»è®¤å¼: ((0)) ///</summary> /// è¡¥é¢æ°é /// é»è®¤å¼: ((0)) /// </summary> [SugarColumn(ColumnName = "dab021")] public decimal? Dab021 { get; set; } /// <summary> /// éææ°é /// é»è®¤å¼: ((0)) ///</summary> /// éææ°é /// é»è®¤å¼: ((0)) /// </summary> [SugarColumn(ColumnName = "dab022")] public decimal? Dab022 { get; set; } /// <summary> /// è¶ é¢æ°é /// é»è®¤å¼: ((0)) ///</summary> /// è¶ é¢æ°é /// é»è®¤å¼: ((0)) /// </summary> [SugarColumn(ColumnName = "dab023")] public decimal? Dab023 { get; set; } /// <summary> /// è¯åéæ /// é»è®¤å¼: ((0)) ///</summary> /// è¯åéæ /// é»è®¤å¼: ((0)) /// </summary> [SugarColumn(ColumnName = "lp_tl")] public int? LpTl { get; set; } /// <summary> /// æ¥æä¸è¯ /// é»è®¤å¼: ((0)) ///</summary> /// æ¥æä¸è¯ /// é»è®¤å¼: ((0)) /// </summary> [SugarColumn(ColumnName = "ll_bl")] public int? LlBl { get; set; } /// <summary> /// ä½ä¸ä¸è¯ /// é»è®¤å¼: ((0)) ///</summary> /// ä½ä¸ä¸è¯ /// é»è®¤å¼: ((0)) /// </summary> [SugarColumn(ColumnName = "zy_bl")] public int? ZyBl { get; set; } /// <summary> /// åå¹¶æ è¯ /// é»è®¤å¼: ((0)) ///</summary> /// åå¹¶æ è¯ /// é»è®¤å¼: ((0)) /// </summary> [SugarColumn(ColumnName = "hb_flag")] public int? HbFlag { get; set; } /// <summary> /// åå¹¶åå· ///</summary> /// åå¹¶åå· /// </summary> [SugarColumn(ColumnName = "hb_no")] public string? HbNo { get; set; } /// <summary> /// ç©æç¼ç ///</summary> /// ç©æç¼ç /// </summary> [SugarColumn(ColumnName = "dab024")] public string? Dab024 { get; set; } service/Warehouse/MesItemBlManager.cs
@@ -235,7 +235,6 @@ .Count(); if (itemCount > 0) { // æ´æ°å·²åå¨çç©ææç»æ°é db.Updateable<MesInvItemOutItems>() .SetColumns(i => @@ -243,9 +242,7 @@ .Where(i => i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId) .ExecuteCommand(); } else { // æå ¥æ°çç©ææç»è®°å½ db.Insertable(new MesInvItemOutItems { @@ -267,11 +264,10 @@ ErpId = womdab.Eid, ErpAutoid = womdab.Erpid, PbillNo = query.billNo, ItemId = blDetail.Bld012, ItemId = blDetail.Bld012 // Unit = blDetail.Bld009, // DepotId = (int)stockBarcode.DepotsId }).IgnoreColumns(true).ExecuteCommand(); } // æå ¥åºåºåæ¡ç æç» db.Insertable(new MesInvItemOutCDetails @@ -332,7 +328,7 @@ WorkNo = blDetail.Bld001, // Matches C_QTCK_D.Bld001 WorkLine = blDetail.Bld013, // Matches C_QTCK_D.Bld013 SuppNo = stockBarcode.SuppNo, ItemId = stockBarcode.ItemId, ItemId = stockBarcode.ItemId // CkDepot = stockBarcode.DepotsId }).IgnoreColumns(true).ExecuteCommand(); @@ -363,13 +359,11 @@ .First(); if ((blDetail1.Bld007 ?? 0) <= (blDetail1.Bld008 ?? 0)) { // æ´æ°æç»å®æç¶æ db.Updateable<MesItemBlDetail>() .SetColumns(it => it.Bld011 == 1) .Where(it => it.Id == blDetail1.Id) .ExecuteCommand(); } // æ´æ°åºåæ°é为0 db.Updateable<MesInvItemStocks>() @@ -386,7 +380,6 @@ .First(); if (unfinishedDetail == null) { // å¦ææ²¡ææªå®æçæç»ï¼æ´æ°è¡¥æåç¶æä¸ºå·²å®æ db.Updateable<MesItemBl>() .SetColumns(it => new MesItemBl @@ -397,7 +390,6 @@ }) .Where(it => it.Id == mesItemBl.Id) .ExecuteCommand(); } return 1; }); @@ -471,7 +463,7 @@ if (stockBarcode == null) throw new Exception($"åºå䏿 æ¤æ¡ç ,è¯·æ ¸å¯¹ï¼{query.barcode}"); var totalQty = stockBarcode.Quantity; string newBarcode = null; @@ -527,7 +519,7 @@ // Memo = stockBarcode.Memo, SuppNo = stockBarcode.SuppNo, // InsDate = stockBarcode.InsDate, // Added InsDate ItemId = stockBarcode.ItemId, ItemId = stockBarcode.ItemId // ItemUnit = stockBarcode.ItemUnit // Added ItemUnit }).IgnoreColumns(true).ExecuteCommand(); @@ -567,7 +559,7 @@ WorkNo = stockBarcode.WorkNo, WorkLine = stockBarcode.WorkLine, SuppNo = stockBarcode.SuppNo, ItemId = stockBarcode.ItemId, ItemId = stockBarcode.ItemId // UnitId = stockBarcode.ItemUnit }).IgnoreColumns(true).ExecuteCommand(); @@ -601,7 +593,7 @@ WorkLine = stockBarcode.WorkLine, SuppNo = stockBarcode.SuppNo, SuppId = stockBarcode.SuppId, ItemId = stockBarcode.ItemId, ItemId = stockBarcode.ItemId // CkDepot = stockBarcode.DepotsId }).IgnoreColumns(true).ExecuteCommand(); } @@ -611,7 +603,7 @@ } if (string.IsNullOrEmpty(newBarcode)) newBarcode = query.barcode; // æ£æ¥è¡¥æåç¶æ var mesItemBl = Db.Queryable<MesItemBl>() .Where(a => a.BlNo == query.blNo && (a.Bl018 ?? false) == false) @@ -652,7 +644,8 @@ throw new Exception($"å·¥å {query.billNo} ä¸åå¨ï¼è¯·ç¡®è®¤ï¼"); var womdab = Db.Queryable<Womdab>() .Where(b => b.Dab001 == query.billNo && b.Erpid == blDetail.Bld014) .Where(b => b.Dab001 == query.billNo && b.Erpid == blDetail.Bld014) .First(); if (womdab == null) @@ -660,13 +653,13 @@ // æ£æ¥å·²åææ°éæ¯å¦è¶ è¿å¾ åææ°é var sumQty = db.Queryable<MesInvItemOutCDetails>() .Where(it => it.TaskNo == query.blNo && it.ItemId == stockBarcode.ItemId) .Where(it => it.TaskNo == query.blNo && it.ItemId == stockBarcode.ItemId) .Sum(it => it.Quantity); if (sumQty > remainingQty) { throw new Exception($"æåæ°éï¼{sumQty} 大äºå¾ åææ°éï¼{remainingQty}ï¼è¯·æ ¸å¯¹ï¼"); } throw new Exception( $"æåæ°éï¼{sumQty} 大äºå¾ åææ°éï¼{remainingQty}ï¼è¯·æ ¸å¯¹ï¼"); // è·åæå建åºåºå var itemOut = db.Queryable<MesInvItemOuts>() @@ -720,7 +713,6 @@ .Count(); if (itemOutItemCount == 0) { // æå ¥æ°çåºåºåæç» executeCommand += db.Insertable(new MesInvItemOutItems { @@ -742,13 +734,11 @@ ErpId = womdab.Eid, ErpAutoid = womdab.Erpid, PbillNo = query.billNo, ItemId = blDetail.Bld012, ItemId = blDetail.Bld012 // Unit = blDetail.Bld009, // DepotId = (int)stockBarcode.DepotsId }).IgnoreColumns(true).ExecuteCommand(); } else { // æ´æ°å·²æåºåºåæç»æ°é executeCommand += db.Updateable<MesInvItemOutItems>() .SetColumns(it => it.Quantity == it.Quantity + query.Num) @@ -756,7 +746,6 @@ it.ItemOutId == itemOut.Guid && it.ItemId == stockBarcode.ItemId) .ExecuteCommand(); } // æå ¥åºåºæ¡ç æç» executeCommand += db.Insertable(new MesInvItemOutCDetails @@ -816,7 +805,7 @@ WorkNo = blDetail.Bld001, WorkLine = blDetail.Bld013, SuppNo = stockBarcode.SuppNo, ItemId = stockBarcode.ItemId, ItemId = stockBarcode.ItemId // CkDepot = stockBarcode.DepotsId }).IgnoreColumns(true).ExecuteCommand(); @@ -848,13 +837,11 @@ .First(); if ((updatedDetail.Bld007 ?? 0) <= (updatedDetail.Bld008 ?? 0)) { // æ´æ°æç»å®æç¶æ executeCommand += db.Updateable<MesItemBlDetail>() .SetColumns(it => new MesItemBlDetail { Bld011 = 1 }) .Where(it => it.Id == blDetail.Id) .ExecuteCommand(); } // æ£æ¥æ¯å¦è¿ææªå®æçæç» @@ -863,7 +850,6 @@ .First(); if (unfinishedDetail == null) { // å¦ææ²¡ææ¾å°æªå®ææç»ï¼åæ´æ°è¡¥æåç¶æä¸ºå·²å®æ executeCommand += db.Updateable<MesItemBl>() .SetColumns(it => new MesItemBl @@ -874,8 +860,7 @@ }) .Where(it => it.Id == mesItemBl.Id) .ExecuteCommand(); } if (executeCommand <= 1) throw new Exception("æ´æ°å¤±è´¥"); return executeCommand; @@ -1103,7 +1088,7 @@ UseTransaction(db => { // çææè·ååºåºå Guid outId = Guid.Empty; var outId = Guid.Empty; var outNo = ""; var outRecord = db.Queryable<MesInvItemOuts>() .Where(a => a.BbillNo == query.blNo @@ -1157,7 +1142,6 @@ .First(); if (outItem == null) { // æå ¥åºåºåæç» db.Insertable(new MesInvItemOutItems { @@ -1177,13 +1161,11 @@ ErpId = womdab.Eid, ErpAutoid = womdab.Erpid, PbillNo = query.billNo, ItemId = blDetail.Bld012, ItemId = blDetail.Bld012 // Unit = blDetail.Bld009, // DepotId = stockBarcode.DepotsId }).IgnoreColumns(true).ExecuteCommand(); } else { // æ´æ°åºåºåæç»æ°é db.Updateable<MesInvItemOutItems>() .SetColumns(it => new MesInvItemOutItems @@ -1194,7 +1176,6 @@ it.ItemOutId == outId && it.ItemId == stockBarcode.ItemId) .ExecuteCommand(); } // æå ¥åºåºæ¡ç æç» db.Insertable(new MesInvItemOutCDetails @@ -1247,7 +1228,7 @@ WorkLine = blDetail.Bld013, SuppNo = stockBarcode.SuppNo, SuppId = stockBarcode.SuppId, ItemId = stockBarcode.ItemId, ItemId = stockBarcode.ItemId // CkDepot = stockBarcode.DepotsId }).IgnoreColumns(true).ExecuteCommand(); @@ -1287,12 +1268,10 @@ // å¦ææææç»å®æ,æ´æ°è¶ é¢åç¶æä¸ºå·²å®æ if (!hasUnfinished) { db.Updateable<MesItemBl>() .SetColumns(it => it.Bl019 == true) .Where(it => it.Id == mesItemBl.Id) .ExecuteCommand(); } return 1; }); @@ -1317,7 +1296,7 @@ } /// <summary> /// çäº§è¶ é¢æå°æ¡ç /// çäº§è¶ é¢æå°æ¡ç /// </summary> /// <param name="query">æ¥è¯¢åæ°</param> /// <returns>å¤çç»æ</returns> @@ -1560,7 +1539,6 @@ .Count(); if (itemOutItemCount == 0) { // æå ¥æ°çåºåºåæç» db.Insertable(new MesInvItemOutItems { @@ -1582,13 +1560,11 @@ ErpId = workOrderDetail.Eid, ErpAutoid = workOrderDetail.Erpid, PbillNo = query.billNo, ItemId = blDetail.Bld012, ItemId = blDetail.Bld012 // Unit = blDetail.Bld009, // DepotId = stockBarcode.DepotsId }).IgnoreColumns(true).ExecuteCommand(); } else { // æ´æ°å·²æåºåºåæç»æ°é db.Updateable<MesInvItemOutItems>() .SetColumns(it => it.Quantity == it.Quantity + query.Num) @@ -1596,7 +1572,6 @@ it.ItemOutId == itemOut.Guid && it.ItemId == stockBarcode.ItemId) .ExecuteCommand(); } // æå ¥åºåºæç»è®°å½ db.Insertable(new MesInvItemOutCDetails @@ -1685,13 +1660,11 @@ .First(); if ((blDetail1.Bld007 ?? 0) <= (blDetail1.Bld008 ?? 0)) { // æ´æ°æç»å®æç¶æ db.Updateable<MesItemBlDetail>() .SetColumns(it => it.Bld011 == 1) .Where(it => it.Id == blDetail1.Id) .ExecuteCommand(); } // æ£æ¥æ¯å¦æææç»é½å·²å®æ var hasUnfinished = db.Queryable<MesItemBlDetail>() @@ -1700,12 +1673,10 @@ // å¦ææææç»å®æ,æ´æ°è¡¥æåç¶æä¸ºå·²å®æ if (!hasUnfinished) { db.Updateable<MesItemBl>() .SetColumns(it => it.Bl019 == true) .Where(it => it.Id == mesItemBl.Id) .ExecuteCommand(); } return 1; }); service/Wom/MesWorkProdCDetailsManager.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,9 @@ using NewPdaSqlServer.DB; using NewPdaSqlServer.entity; namespace NewPdaSqlServer.service.Wom; public class MesWorkProdCDetailsManager : Repository<MesWorkProdCDetails> { //å½å类已ç»ç»§æ¿äº Repository å¢ãå ãæ¥ãæ¹çæ¹æ³ } service/Wom/MesWorkProdManager.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,331 @@ using NewPdaSqlServer.DB; using NewPdaSqlServer.Dto.service; using NewPdaSqlServer.entity; using NewPdaSqlServer.util; using SqlSugar; namespace NewPdaSqlServer.service.Wom; public class MesWorkProdManager : Repository<MesWorkProd> { //å½å类已ç»ç»§æ¿äº Repository å¢ãå ãæ¥ãæ¹çæ¹æ³ /// <summary> /// PDAæ«æç产æ¥å·¥ /// </summary> public ScanWorkResult ScanWorkAsync(ScanWorkRequest request) { // æ¥è¯¢äººåä¿¡æ¯ var staff = Db.Queryable<MesStaff>() .Where(x => x.StaffNo == request.StaffNo) .First(); if (staff == null) throw new Exception("请å éæ©äººå"); // æ¥è¯¢æ¡ç ä¿¡æ¯ var barcode = Db.Queryable<MesInvItemBarcodes>() .Where(x => x.ItemBarcode == request.ItemBarcode) .First(); if (barcode == null) throw new Exception($"æ æ¤æ¡ç ï¼è¯·æ ¸å¯¹ï¼{request.ItemBarcode}"); // æ¥è¯¢ç©æä¿¡æ¯ var item = Db.Queryable<MesItems>() .Where(x => x.Id == barcode.ItemId) .First(); if (item == null) throw new Exception($"æ æ¤ç©æï¼è¯·æ ¸å¯¹ï¼{request.ItemBarcode}"); // ç¡®å®åæ®ç±»å int billTypeId = 900; int transactionNo = 902; switch (barcode.Memo?.Trim() ?? "0") { case "ä¸å°": transactionNo = 901; break; case "åæå": transactionNo = 902; break; case "å è£ ": case "æå": transactionNo = 903; break; } // æ£æ¥æ¡ç æ¯å¦é夿«æ var exists = Db.Queryable<MesWorkProd, MesWorkProdCDetails>( (a, b) => new JoinQueryInfos(JoinType.Inner, a.BillNo == b.BillNo)) .Where((a, b) => b.ItemBarcode == request.ItemBarcode && a.BillTypeId == billTypeId && a.TransactionNo == transactionNo) .Any(); if (exists) throw new Exception("æ¡ç é夿«æï¼è¯·æ ¸å¯¹ï¼"); // è·åå·²æ¥å·¥æ°é var reportedQty = Db.Queryable<MesWorkProd, MesWorkProdCDetails>( (a, b) => new JoinQueryInfos(JoinType.Inner, a.BillNo == b.BillNo)) .Where((a, b) => a.BillTypeId == billTypeId && a.TransactionNo == transactionNo && a.TaskNo == barcode.BillNo) .Sum((a, b) => b.Quantity); // è·åå·¥åè®¡åæ°éååå· var workOrder = Db.Queryable<Womdaa>() .Where(x => x.Daa001 == barcode.BillNo) .First(); if (workOrder == null) throw new Exception($"æ å·¥åæç»ï¼è¯·æ ¸å¯¹ï¼{request.ItemBarcode}"); var planQty = workOrder.Daa008; var itemModel = workOrder.Daa004; UseTransaction(db => { // ææ°éæ¡ç èªå¨æ¥å·¥ if (barcode.Quantity > 0) { var reportQty = barcode.Quantity; if (reportQty <= 0) throw new Exception( $"æ¥å·¥æ°éä¸è½å°äºçäº0ï¼è¯·æ ¸å¯¹ï¼{request.ItemBarcode}"); var totalQty = (reportedQty ?? 0) + reportQty; if (totalQty > workOrder.Daa008) throw new Exception( $"æ¬æ¬¡æ¥å·¥æ°éï¼{reportQty} 大äºå©ä½æ¥å·¥æ°éï¼{workOrder.Daa008 - reportedQty ?? 0}ï¼è¯·æ ¸å¯¹ï¼"); // æ´æ°æ¡ç ç¶æ db.Updateable<MesInvItemBarcodes>() .SetColumns(x => new MesInvItemBarcodes { WorkFlg = true, Quantity = reportQty }) .Where(x => x.Guid == barcode.Guid) .ExecuteCommandAsync(); // è·åæå建æ¥å·¥å var workProd = db.Queryable<MesWorkProd>() .Where(x => x.TaskNo == barcode.BillNo && x.CreateDate.Value.Date.ToString( "yyyy-MM-dd") == DateTime.Now.Date.ToString("yyyy-MM-dd") && x.BillTypeId == billTypeId && x.TransactionNo == transactionNo && x.Status == 0) .First(); if (workProd == null) { var id = Guid.NewGuid(); var billNo = BillNo.GetBillNo("MES_WORK"); workProd = new MesWorkProd { Id = id, BillNo = billNo, LineNo = barcode.LineNo, Company = barcode.Company, Factory = barcode.Factory, CreateBy = request.UserNo, CreateDate = DateTime.Now, LastupdateBy = request.UserNo, LastupdateDate = DateTime.Now, BillTypeId = billTypeId, TransactionNo = transactionNo, TaskNo = barcode.BillNo }; db.Insertable(workProd).IgnoreColumns(true) .ExecuteCommand(); } // æå ¥æ¥å·¥æç» var detailId = Guid.NewGuid(); db.Insertable(new MesWorkProdCDetails { Id = detailId, BillNo = workProd.BillNo, ItemBarcode = request.ItemBarcode, Quantity = (int)reportQty, Company = barcode.Company, Factory = barcode.Factory, CreateBy = request.UserNo, CreateDate = DateTime.Now, LastupdateBy = request.UserNo, LastupdateDate = DateTime.Now, ItemNo = item.ItemNo, WorkLast = barcode.WorkLast, SilkPqty = barcode.SilkPqty, SilkId = barcode.SilkId, Silk = barcode.Silk, BgYg = staff.Id }).IgnoreColumns(true).ExecuteCommand(); // æ´æ°å·¥åå·²æ¥å·¥æ°é db.Updateable<Womdaa>() .SetColumns(x => x.Daa011 == (x.Daa011 ?? 0) + (int)barcode.Quantity ) .Where(x => x.Daa001 == barcode.BillNo) .ExecuteCommandAsync(); // éæ°è·åå·²æ¥å·¥æ°é reportedQty = db.Queryable<MesWorkProd, MesWorkProdCDetails>( (a, b) => new JoinQueryInfos(JoinType.Inner, a.BillNo == b.BillNo)) .Where((a, b) => a.BillTypeId == billTypeId && a.TransactionNo == transactionNo && a.TaskNo == barcode.BillNo) .Sum((a, b) => b.Quantity); } return 1; }); return new ScanWorkResult { TaskNo = barcode.TaskNo, ItemNo = item.ItemNo, PlanQty = planQty ?? 0, ReportedQty = reportedQty ?? 0, CurrentQty = barcode.Quantity.Value, BarcodeQty = barcode.Quantity.Value, ItemName = item.ItemName, ItemModel = itemModel, Message = "æ«ç æåï¼" }; } /// <summary> /// PDAæ«æç产æ¥å·¥ prc_rf_pda_scan_work_prod /// </summary> public bool ScanWorkProdAsync(ScanWorkRequest request) { if (request.Quantity <= 0) throw new Exception("æ¥å·¥æ°éä¸è½å°äºçäº 0ï¼è¯·æ ¸å¯¹ï¼"); // æ¥è¯¢æ¡ç ä¿¡æ¯ var barcode = Db.Queryable<MesInvItemBarcodes>() .Where(x => x.ItemBarcode == request.ItemBarcode) .First(); if (barcode == null) throw new Exception($"åºå䏿 æ¤æ¡ç ï¼è¯·æ ¸å¯¹ï¼{request.ItemBarcode}"); // æ¥è¯¢å·¥åä¿¡æ¯ var womdaa = Db.Queryable<Womdaa>() .Where(x => x.Daa001 == barcode.BillNo) .First(); if (womdaa == null) throw new Exception($"æ¡ç 䏿¯æ¥å·¥æ¡ç /æ 对åºå·¥åï¼è¯·æ ¸å¯¹ï¼{request.ItemBarcode}"); // ç¡®å®åæ®ç±»å int billTypeId = 900; int transactionNo = 902; switch (barcode.Memo?.Trim() ?? "0") { case "ä¸å°": transactionNo = 901; break; case "åæå": transactionNo = 902; break; case "æå": case "å è£ ": transactionNo = 903; break; } // æ±æ»å·²æ«æ¡ç æ°é var sumQty = Db.Queryable<MesWorkProd, MesWorkProdCDetails>((a, b) => new JoinQueryInfos(JoinType.Inner, a.BillNo == b.BillNo)) .Where((a, b) => a.BillTypeId == billTypeId && a.TransactionNo == transactionNo && b.SilkId == barcode.SilkId && a.TaskNo == barcode.BillNo) .Sum((a, b) => b.Quantity); sumQty = (sumQty ?? 0) + (int)request.Quantity; if (sumQty > womdaa.Daa008) throw new Exception( $"æ¬æ¬¡æ¥å·¥æ°éï¼{request.Quantity} 大äºå©ä½æ¥å·¥æ°éï¼{womdaa.Daa008 - (sumQty - request.Quantity)}ï¼è¯·æ ¸å¯¹ï¼"); return UseTransaction(db => { // æ´æ°æ¡ç ä¿¡æ¯ db.Updateable<MesInvItemBarcodes>() .SetColumns(x => x.WorkFlg == true) .SetColumns(x => x.Quantity == request.Quantity) .Where(x => x.Guid == barcode.Guid) .ExecuteCommand(); // è·åæå建æ¥å·¥å var workProd = db.Queryable<MesWorkProd>() .Where(x => x.TaskNo == barcode.BillNo && x.CreateDate.Value.Date.ToString("yyyy-MM-dd") == DateTime.Now.Date.ToString("yyyy-MM-dd") && x.BillTypeId == billTypeId && x.TransactionNo == transactionNo && x.Status == 0) .First(); if (workProd == null) { var billNo = BillNo.GetBillNo("MES_WORK"); workProd = new MesWorkProd { Id = Guid.NewGuid(), BillNo = billNo, LineNo = barcode.LineNo, Company = barcode.Company, Factory = barcode.Factory, CreateBy = request.UserNo, CreateDate = DateTime.Now, LastupdateBy = request.UserNo, LastupdateDate = DateTime.Now, PbillNo = barcode.BillNo, // Added PbillNo field BillTypeId = billTypeId, TransactionNo = transactionNo, TaskNo = barcode.BillNo }; db.Insertable(workProd).IgnoreColumns(true).ExecuteCommand(); } // æå ¥æ¥å·¥æç» var detail = new MesWorkProdCDetails { Id = Guid.NewGuid(), BillNo = workProd.BillNo, ItemBarcode = request.ItemBarcode, Quantity = (int)request.Quantity, Company = barcode.Company, Factory = barcode.Factory, CreateBy = request.UserNo, CreateDate = DateTime.Now, LastupdateBy = request.UserNo, LastupdateDate = DateTime.Now, ItemNo = barcode.ItemNo, PbillNo = barcode.BillNo, // Added PbillNo from barcode WorkLast = barcode.WorkLast, SilkPqty = barcode.SilkPqty, SilkId = barcode.SilkId, Silk = barcode.Silk }; db.Insertable(detail).IgnoreColumns(true).ExecuteCommand(); return 1; }) > 0; } } service/base/MesStaffManager.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,11 @@ using NewPdaSqlServer.DB; using NewPdaSqlServer.entity; namespace NewPdaSqlServer.service.@base; public class MesStaffManager : Repository<MesStaff> { //å½å类已ç»ç»§æ¿äº Repository å¢ãå ãæ¥ãæ¹çæ¹æ³ //è¿éé¢åç代ç ä¸ä¼ç»è¦ç,妿è¦éæ°çæè¯·å é¤ MesStaffManager.cs }