Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
2023-11-22 16:04:20 +08:00

View File

@@ -237,6 +237,10 @@ namespace Tnb.WarehouseMgr
startlocation_code = sPoint?.location_code!, startlocation_code = sPoint?.location_code!,
endlocation_id = ePoint?.location_id!, endlocation_id = ePoint?.location_id!,
endlocation_code = ePoint?.location_code!, endlocation_code = ePoint?.location_code!,
startpoint_id = sPoint?.id!,
startpoint_code = sPoint?.point_code!,
endpoint_id = ePoint?.id!,
endpoint_code = ePoint?.point_code!,
start_floor = sPoint?.floor.ToString(), start_floor = sPoint?.floor.ToString(),
end_floor = ePoint?.floor.ToString(), end_floor = ePoint?.floor.ToString(),
bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult(), bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult(),