Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs

@@ -2092,8 +2092,9 @@ namespace Tnb.ProductionMgr
                     
                 }else if (mo.mo_type == DictConst.PrdMoTypeJC && prdMoTask.is_hand_set_batch==0)
                 {
+                    EqpEquipment equipment = await _db.Queryable<EqpEquipment>().SingleAsync(x => x.id == prdMoTask.eqp_id);
                     ToolMolds toolMolds = await _db.Queryable<ToolMolds>().SingleAsync(x => x.id == prdMoTask.mold_id);
-                    batch = $"6{toolMolds.mold_code.Substring(toolMolds.mold_code.Length - 4, 2)}{DateTime.Now.ToString("yyMMdd")}";
+                    batch = $"6{toolMolds.mold_code.Substring(toolMolds.mold_code.Length - 4, 2)}{equipment.code.Substring(equipment.code.Length - 2, 2)}{DateTime.Now.ToString("yyMMdd")}";
                     await db.Updateable<PrdMoTask>()
                         .SetColumns(x => x.batch == batch)
                         .Where(x => x.id == prdMoTask.id)
@@ -2659,7 +2660,7 @@ namespace Tnb.ProductionMgr
                     thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN+"uapws/rest/pwrnew/save";
                     thirdWebapiRecord.request_data = JsonConvert.SerializeObject(erpRequestData);
                     thirdWebapiRecord.create_time = DateTime.Now;
-                    thirdWebapiRecord.remark = $"载具编号:{report?.material_box_code ?? ""}";
+                    thirdWebapiRecord.remark = $"【PrdMoTaskService ReportInstock】载具编号:{report?.material_box_code ?? ""}";
                     await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync();
 
                     if(callErp.value=="1"){

WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs

@@ -3334,7 +3334,7 @@ namespace Tnb.WarehouseMgr
             thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/generalin/save";
             thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData);
             thirdWebapiRecord.create_time = DateTime.Now;
-            thirdWebapiRecord.remark = $"原材料转库单wms_material_transfer:{wmsMaterialTransfer.bill_code},erp转库单:{wmsMaterialTransfer.erp_bill_code}";
+            thirdWebapiRecord.remark = $"【WareHouseService QTRK2BIP】原材料转库单wms_material_transfer:{wmsMaterialTransfer.bill_code},erp转库单:{wmsMaterialTransfer.erp_bill_code}";
 
             await db.Insertable(thirdWebapiRecord).ExecuteCommandAsync();
             

WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs

@@ -320,7 +320,7 @@ namespace Tnb.WarehouseMgr
                                 instock!.sync_status = callBackRes == true ? WmsWareHouseConst.SYNC_STATUS__SYNCCOMPLETE : WmsWareHouseConst.SYNC_STATUS__SYNCFAILED;
                                 _ = await _db.Updateable(instock).UpdateColumns(it => it.sync_status).ExecuteCommandAsync();
                             }
-                            List<WmsInstockD> allInstockDetails = await _db.Queryable<WmsInstockD>().Where(it => it.bill_id == input.requireId).ToListAsync();
+                            List<WmsInstockD> allInstockDetails = await _db.Queryable<WmsInstockD>().Where(it => it.bill_id == input.requireId).OrderBy(x=>x.id).ToListAsync();
                             if (allInstockDetails.All(x => x.line_status == WmsWareHouseConst.BILLSTATUS_COMPLETE_ID))
                             {
                                 instock.status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID;
@@ -460,7 +460,7 @@ namespace Tnb.WarehouseMgr
                             thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/purchaseIn/save";
                             thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData);
                             thirdWebapiRecord.create_time = DateTime.Now;
-                            thirdWebapiRecord.remark = "采购收货单号:" + (wmsPurchaseH?.bill_code ?? "") + ",erp采购订单号:" + (wmsPurchaseOrderH?.erp_bill_code ?? "");
+                            thirdWebapiRecord.remark = "【WmsInStockService ModifyAsync】采购收货单号:" + (wmsPurchaseH?.bill_code ?? "") + ",erp采购订单号:" + (wmsPurchaseOrderH?.erp_bill_code ?? "");
                             await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync();
                             BasFactoryConfig callErp = await _db.Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.CALLERP);
                             if (callErp.value == "1")

WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs

@@ -456,7 +456,7 @@ namespace Tnb.WarehouseMgr
                             thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/transOut/save";
                             thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData);
                             thirdWebapiRecord.create_time = DateTime.Now;
-                            thirdWebapiRecord.remark = $"原材料调拨出库wms_rawmat_transferoutstock_h:{wmsRawmatTransferoutstockH.bill_code}";
+                            thirdWebapiRecord.remark = $"【WmsMaterialSignHService MaterialSign】原材料调拨出库wms_rawmat_transferoutstock_h:{wmsRawmatTransferoutstockH.bill_code}";
                             await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync();
                             
                             BasFactoryConfig callErp = await _db.Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.CALLERP);
@@ -572,7 +572,7 @@ namespace Tnb.WarehouseMgr
                             thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/generalout/save";
                             thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData);
                             thirdWebapiRecord.create_time = DateTime.Now;
-                            thirdWebapiRecord.remark = $"原材料转库单wms_material_transfer:{wmsMaterialTransfer.bill_code},erp转库单:{wmsMaterialTransfer.erp_bill_code}";
+                            thirdWebapiRecord.remark = $"【WmsMaterialSignHService MaterialSign】原材料转库单wms_material_transfer:{wmsMaterialTransfer.bill_code},erp转库单:{wmsMaterialTransfer.erp_bill_code}";
 
                             await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync();
                             Logger.LogInformation("【WmsMaterialSignHService ModifyAsync】同步其它出库单到erp成功");
@@ -655,7 +655,7 @@ namespace Tnb.WarehouseMgr
                                 thirdWebapiRecord2.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/generalin/save";
                                 thirdWebapiRecord2.request_data = JsonConvert.SerializeObject(requestData2);
                                 thirdWebapiRecord2.create_time = DateTime.Now;
-                                thirdWebapiRecord2.remark = $"原材料转库单wms_material_transfer:{wmsMaterialTransfer.bill_code},erp转库单:{wmsMaterialTransfer.erp_bill_code}";
+                                thirdWebapiRecord2.remark = $"【WmsMaterialSignHService MaterialSign】原材料转库单wms_material_transfer:{wmsMaterialTransfer.bill_code},erp转库单:{wmsMaterialTransfer.erp_bill_code}";
                                 
                                 await _db.Insertable(thirdWebapiRecord2).ExecuteCommandAsync();
                                 Logger.LogInformation("【WmsMaterialSignHService ModifyAsync】同步其它入库单到erp成功");

WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs

@@ -1206,7 +1206,7 @@ namespace Tnb.WarehouseMgr
                     thirdWebapiRecord2.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/generalin/save";
                     thirdWebapiRecord2.request_data = JsonConvert.SerializeObject(requestData2);
                     thirdWebapiRecord2.create_time = DateTime.Now;
-                    thirdWebapiRecord2.remark = $"原材料转库单wms_material_transfer:{wmsMaterialTransfer.bill_code},erp转库单:{wmsMaterialTransfer.erp_bill_code}";
+                    thirdWebapiRecord2.remark = $"【WmsMaterialTransferService ModifyAsync】原材料转库单wms_material_transfer:{wmsMaterialTransfer.bill_code},erp转库单:{wmsMaterialTransfer.erp_bill_code}";
                     
                     await _db.Insertable(thirdWebapiRecord2).ExecuteCommandAsync();
                     
@@ -1320,7 +1320,7 @@ namespace Tnb.WarehouseMgr
                         thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/generalout/save";
                         thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData);
                         thirdWebapiRecord.create_time = DateTime.Now;
-                        thirdWebapiRecord.remark = $"原材料转库单wms_material_transfer:{wmsMaterialTransfer.bill_code},erp转库单:{wmsMaterialTransfer.erp_bill_code}";
+                        thirdWebapiRecord.remark = $"【WmsMaterialTransferService ModifyAsync】原材料转库单wms_material_transfer:{wmsMaterialTransfer.bill_code},erp转库单:{wmsMaterialTransfer.erp_bill_code}";
 
                         await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync();
                         Logger.LogInformation("【WmsMaterialTransferService ModifyAsync】同步其它出库单到erp成功");

WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs

@@ -375,7 +375,7 @@ namespace Tnb.WarehouseMgr
                 }
                 
                 
-                List<WmsPrdInstockCode> allInstockDetails = await _db.Queryable<WmsPrdInstockCode>().Where(it => it.prd_instockD_id == wmsPrdInstockD.id).ToListAsync();
+                List<WmsPrdInstockCode> allInstockDetails = await _db.Queryable<WmsPrdInstockCode>().Where(it => it.prd_instockD_id == wmsPrdInstockD.id).OrderBy(x=>x.id).ToListAsync();
 
                 List<String> materialIds = Arrays.AsList(instock.material_id);
                 List<String> unitIds = allInstockDetails.Select(x => x.unit_id).Distinct().ToList();
@@ -473,7 +473,7 @@ namespace Tnb.WarehouseMgr
                 thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/productin/save";
                 thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData);
                 thirdWebapiRecord.create_time = DateTime.Now;
-                thirdWebapiRecord.remark = $"载具编号:{prdReport?.material_box_code ?? ""},提报id:{prdReport?.id}";
+                thirdWebapiRecord.remark = $"【WmsPrdInstockHService ModifyAsync】载具编号:{prdReport?.material_box_code ?? ""},提报id:{prdReport?.id}";
                 await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync();
                 
                 BasFactoryConfig callErp = await _db.Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.CALLERP);

WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs

@@ -122,7 +122,7 @@ namespace Tnb.WarehouseMgr
                 // 托盘对应入库单
                 List<WmsInstockH> instock_mains = await _db.Queryable<WmsInstockH>().Where(x => x.source_id == wmsPurchaseD.bill_id).ToListAsync();
 
-                List<WmsInstockD> allInstockDetails = await _db.Queryable<WmsInstockD>().Where(it => instock_mains.Select(r => r.id).Contains(it.bill_id) && it.material_id == wmsPurchaseD.material_id && it.code_batch == wmsPurchaseD.code_batch).ToListAsync();
+                List<WmsInstockD> allInstockDetails = await _db.Queryable<WmsInstockD>().Where(it => instock_mains.Select(r => r.id).Contains(it.bill_id) && it.material_id == wmsPurchaseD.material_id && it.code_batch == wmsPurchaseD.code_batch).OrderBy(x=>x.id).ToListAsync();
 
                 List<Dictionary<string, object>> requestData = new List<Dictionary<string, object>>();
                 List<string> carryIds = instock_mains.Select(x => x.carry_id).ToList();
@@ -277,7 +277,7 @@ namespace Tnb.WarehouseMgr
                 thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/purchaseIn/save";
                 thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData);
                 thirdWebapiRecord.create_time = DateTime.Now;
-                thirdWebapiRecord.remark = "采购收货单号:" + (wmsPurchaseH?.bill_code ?? "")+ ",erp采购订单号:"+(wmsPurchaseOrderH?.erp_bill_code ?? "");
+                thirdWebapiRecord.remark = "【WmsPurchaseDService SaveCheckResult】采购收货单号:" + (wmsPurchaseH?.bill_code ?? "")+ ",erp采购订单号:"+(wmsPurchaseOrderH?.erp_bill_code ?? "");
                 
                 await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync();
                 

WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs

@@ -320,7 +320,7 @@ namespace Tnb.WarehouseMgr
                         thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN+"uapws/rest/purarrvial/save";
                         thirdWebapiRecord.request_data = JsonConvert.SerializeObject(erpRequestData);
                         thirdWebapiRecord.create_time = DateTime.Now;
-                        thirdWebapiRecord.remark = $"erp采购订单:{wmsPurchaseOrderH.erp_bill_code}";
+                        thirdWebapiRecord.remark = $"【WmsPurchaseService Purchase】erp采购订单:{wmsPurchaseOrderH.erp_bill_code}";
 
                         await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync();
                         BasFactoryConfig callErp = await _db.Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.CALLERP);

WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatOutstockService.cs

@@ -87,6 +87,7 @@ namespace Tnb.WarehouseMgr
             
             WmsRawmatOutstockD wmsRawmatOutstockD = await _db.Queryable<WmsRawmatOutstockD>().SingleAsync(x=>x.id==input.source_id);
             WmsRawmatOutstockH wmsRawmatOutstockH = await _db.Queryable<WmsRawmatOutstockH>().SingleAsync(x=>x.id==wmsRawmatOutstockD.bill_id);
+            List<WmsRawmatOutstockD> wmsRawmatOutstockDs = await _db.Queryable<WmsRawmatOutstockD>().Where(x=>x.bill_id==wmsRawmatOutstockH.id).OrderBy(x=>x.id).ToListAsync();
             List<WmsCarryCode> wmsCarryCodes = await _db.Queryable<WmsCarryCode>()
                 .Where(r => r.carry_id == input.wmsDistaskH.carry_id)
                 .Where(r => r.material_id == wmsRawmatOutstockD.material_id && r.code_batch == wmsRawmatOutstockD.batchno)
@@ -160,6 +161,7 @@ namespace Tnb.WarehouseMgr
             List<Dictionary<string, object>> erpRequestDataDetails = new List<Dictionary<string, object>>();
             foreach(var item in wmsCarryCodes)
             {
+                int lineno = (wmsRawmatOutstockDs.FindIndex(x => x.id == wmsRawmatOutstockD.id) + 1) * 10;
                 // 出库数量wmsMaterialSignD.sign_qty
                 erpRequestDataDetails.Add(new Dictionary<string, object>()
                 {
@@ -169,12 +171,12 @@ namespace Tnb.WarehouseMgr
                     ["cmaterialvid"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialvid ?? "",
                     ["corpoid"] = erpOrg.corpoid,
                     ["corpvid"] = erpOrg.corpvid,
-                    ["crowno"] = wmsRawmatOutstockD.lineno,
+                    ["crowno"] = wmsRawmatOutstockD.lineno ?? lineno.ToString(),
                     ["cunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == item.unit_id || x.Id==item.unit_id)?.Id ?? ""))?.cunitid ?? "",
                     ["cvendorid"] = erpExtendFields.Find((x=>x.table_id==item.auxprop_gys))?.supplier_id,
                     ["cvendorvid"] = erpExtendFields.Find((x=>x.table_id==item.auxprop_gys))?.supplier_vid,
                     ["dbizdate"] = wmsRawmatOutstockH.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
-                    ["nshouldnum"] = item.codeqty,
+                    ["nassistnum"] = item.codeqty,
                     ["nnum"] = item.codeqty,
                     ["pk_group"] = erpOrg.pk_group,
                     ["pk_org"] = erpOrg.pk_org,
@@ -195,7 +197,7 @@ namespace Tnb.WarehouseMgr
             thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/materialOut/self/save";
             thirdWebapiRecord.request_data = JsonConvert.SerializeObject(erpRequestData);
             thirdWebapiRecord.create_time = DateTime.Now;
-            thirdWebapiRecord.remark = $"材料出库wms_rawmat_outstock_h:{wmsRawmatOutstockH.bill_code}";
+            thirdWebapiRecord.remark = $"【WmsRawmatOutstockService ModifyAsync】材料出库wms_rawmat_outstock_h:{wmsRawmatOutstockH.bill_code}";
             await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync();
             
             BasFactoryConfig callErp = await _db.Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.CALLERP);

WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs

@@ -91,7 +91,7 @@ namespace Tnb.WarehouseMgr
                        .Where(it => it.id == input.wmsDistaskH.source_id).ExecuteCommandHasChangeAsync();
 
             WmsInstockH instock = await _db.Queryable<WmsInstockH>().SingleAsync(x => x.id == input.requireId);
-            List<WmsInstockD> allInstockDetails = await _db.Queryable<WmsInstockD>().Where(it => it.bill_id == input.requireId).ToListAsync();
+            List<WmsInstockD> allInstockDetails = await _db.Queryable<WmsInstockD>().Where(it => it.bill_id == input.requireId).OrderBy(x=>x.id).ToListAsync();
                         
 
             string rawmatTransferinstockHId = wmsRawmatTransferinstockD?.bill_id ?? "";
@@ -205,7 +205,7 @@ namespace Tnb.WarehouseMgr
             thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/transIn/save";
             thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData);
             thirdWebapiRecord.create_time = DateTime.Now;
-            thirdWebapiRecord.remark = $"原材料调拨入库wms_rawmat_transferinstock_h:{wmsRawmatTransferinstockH.bill_code}";
+            thirdWebapiRecord.remark = $"【WmsRawmatTransferinstockService ModifyAsync】原材料调拨入库wms_rawmat_transferinstock_h:{wmsRawmatTransferinstockH.bill_code}";
             await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync();
             Logger.Information($"完成原材料调拨入库单上传BIP逻辑");
             BasFactoryConfig callErp = await _db.Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.CALLERP);

WarehouseMgr/Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs

@@ -113,7 +113,7 @@ namespace Tnb.WarehouseMgr
 
             }
             WmsSterilizationInstockH wmsRawmatTransferoutstockH = await _db.Queryable<WmsSterilizationInstockH>().SingleAsync(x=>x.id==input.requireId);
-            List<WmsCarryCode> wmsCarryCodes = await _db.Queryable<WmsCarryCode>().Where(r => r.carry_id == input.wmsDistaskH.carry_id).ToListAsync();
+            List<WmsCarryCode> wmsCarryCodes = await _db.Queryable<WmsCarryCode>().Where(r => r.carry_id == input.wmsDistaskH.carry_id).OrderBy(x=>x.id).ToListAsync();
 
             decimal qty = wmsCarryCodes.Sum(r => r.codeqty);
             
@@ -204,7 +204,7 @@ namespace Tnb.WarehouseMgr
             thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/whstrans/save";
             thirdWebapiRecord.request_data = JsonConvert.SerializeObject(erpRequestData);
             thirdWebapiRecord.create_time = DateTime.Now;
-            thirdWebapiRecord.remark = $"任务号wms_distask_h:{input.wmsDistaskH.bill_code},灭菌入库记录wms_sterilization_instock_h:{wmsRawmatTransferoutstockH.bill_code}";
+            thirdWebapiRecord.remark = $"【WmsSterilizationInstockHService ModifyAsync】任务号wms_distask_h:{input.wmsDistaskH.bill_code},灭菌入库记录wms_sterilization_instock_h:{wmsRawmatTransferoutstockH.bill_code}";
             await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync();
             
             BasFactoryConfig callErp = await _db.Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.CALLERP);

WarehouseMgr/Tnb.WarehouseMgr/WmsTransferInstockService.cs

@@ -194,7 +194,7 @@ namespace Tnb.WarehouseMgr
             thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/transIn/save";
             thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData);
             thirdWebapiRecord.create_time = DateTime.Now;
-            thirdWebapiRecord.remark = $"成品调拨入库wms_transfer_instock_h:{wmsTransferInstockH.bill_code}";
+            thirdWebapiRecord.remark = $"【WmsTransferInstockService ModifyAsync】成品调拨入库wms_transfer_instock_h:{wmsTransferInstockH.bill_code}";
             await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync();
             BasFactoryConfig callErp = await _db.Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.CALLERP);
             if(callErp.value=="1"){